diff --git a/FAQ.md b/FAQ.md
index 0607350838..8636689b99 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -6,7 +6,13 @@ At the bottom you can find how to ask other questions, request features and repo
 ## Authorizing accounts
 
 For support on authorizing an account you should consult the documentation of your provider.
-Mostly searching for *IMAP* and the name of the provider is sufficient to find the right documentation.
+Searching for *IMAP* and the name of the provider is mostly sufficient to find the right documentation.
+To setup an account you need the IMAP and SMTP server addresses and port numbers,
+whether STARTTLS should be used and your username and password.
+In some cases you'll need to enable external access to your account and/or to use a special (app) password,
+for instance when two factor authentication is enabled.
+
+For:
 
 * Gmail / G suite: see [question 6](#user-content-faq6)
 * Outlook: see [question 14](#user-content-faq14)
@@ -392,7 +398,7 @@ From: Somebody <somebody@example.org>
 X-Google-Original-From: Somebody <somebody+extra@example.org>
 ```
 
-This means that the edited sender address was automatically being replaced by a validated address before sending the message.
+This means that the edited sender address was automatically replaced by a validated address before sending the message.
 
 Note that this is independent of receiving messages.
 
diff --git a/SETUP.md b/SETUP.md
index 8365b12c3d..d1761ca7f3 100644
--- a/SETUP.md
+++ b/SETUP.md
@@ -25,6 +25,7 @@ If your provider is not in the list of providers, select *Custom*.
 Enter the domain name, for example *gmail.com* and tap *Get settings*.
 If your provider supports [auto-discovery](https://tools.ietf.org/html/rfc6186), FairEmail will fill in the host name and port number,
 else check the setup instructions of your provider for the right IMAP host name and port number.
+For more about this, please see [here](https://github.com/M66B/open-source-email/blob/master/FAQ.md#authorizing-accounts).
 
 ## Identity - to send email