diff --git a/doc/manual_installation/dovecot.rst b/doc/manual_installation/dovecot.rst
index 09f669502..7b8d2f290 100644
--- a/doc/manual_installation/dovecot.rst
+++ b/doc/manual_installation/dovecot.rst
@@ -274,7 +274,11 @@ On success, you should see an output similar to::
   client_secret: XXXX
 
 To enable OAuth2 authentication in Dovecot, edit the :file:`conf.d/10-auth.conf`
-file and add the following line at the end::
+file and update the auth_mechanisms line as follows::
+
+  auth_mechanisms = plain login oauthbearer xoauth2
+
+Then, add the following line at the end::
 
   !include auth-oauth2.conf.ext
 
@@ -291,7 +295,7 @@ Finally, create a file named :file:`conf.d/dovecot-oauth2.conf.ext` with the
 following content::
 
   introspection_mode = post
-  introspection_url = http://dovecot:<client_secret>@localhost/api/o/introspect/
+  introspection_url = https://dovecot:<client_secret>@<hostname of your server>/api/o/introspect/
   username_attribute = username
   tls_ca_cert_file = /etc/ssl/certs/ca-certificates.crt
   active_attribute = active
diff --git a/doc/upgrade.rst b/doc/upgrade.rst
index 87f02a173..d3e5eb0d3 100644
--- a/doc/upgrade.rst
+++ b/doc/upgrade.rst
@@ -306,6 +306,10 @@ by default.
          'rest_framework.authentication.SessionAuthentication',
       ),
 
+Save your modifications at this point and run the :ref:`post upgrade
+commands <post_upgrade_commands>` now.
+
+Then, apply this last modification to your settings:
 
 -  Run the commands indicated :ref:`in the first section <post_upgrade_commands>`
    then add the following content after ``MEDIA_ROOT``: