diff --git a/FAQ.md b/FAQ.md
index 1df9ee8733..8f2eb4b20f 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -34,7 +34,7 @@ Please [see here](https://github.com/M66B/FairEmail/tree/master/tutorials) for t
 
 ## Index
 
-* [Authorizing accounts](#authorizing-accounts)
+* [Configuring accounts](#authorizing-accounts)
 * [How to ...?](#howto)
 * [Known problems](#known-problems)
 * [Planned features](#planned-features)
@@ -43,7 +43,7 @@ Please [see here](https://github.com/M66B/FairEmail/tree/master/tutorials) for t
 
 <br />
 
-<h2><a name="authorizing-accounts"></a>Authorizing accounts</h2>
+<h2><a name="authorizing-accounts"></a>Configuring accounts</h2>
 
 &#x1F30E; [Google Translate](https://translate.google.com/translate?sl=en&u=https%3A%2F%2Fm66b.github.io%2FFairEmail%2F%23authorizing-accounts)
 
@@ -79,7 +79,8 @@ For authorizing:
 * Yandex: please check if [IMAP is enabled](https://yandex.com/support/mail/mail-clients/others.html)
 * Comcast/Xfinity: please check if [third party email access](https://www.xfinity.com/support/articles/third-party-email-access) is enabled
 
-Please see [here](#faq22) for common error messages and solutions.
+Please see [this FAQ](#faq22) for common error messages and solutions,
+and please see [this FAQ](#faq207) in case of '*Authentication failed*' or similar.
 
 Related questions:
 
@@ -88,7 +89,7 @@ Related questions:
 
 <br />
 
-<a name="howto">
+<a name="howto"></a>
 
 ## How to ...?
 
diff --git a/index.html b/index.html
index edc8cdc47b..0ce7cac6bc 100644
--- a/index.html
+++ b/index.html
@@ -59,7 +59,7 @@
 <p><br /></p>
 <h2 id="index">Index</h2>
 <ul>
-<li><a href="#authorizing-accounts">Authorizing accounts</a></li>
+<li><a href="#authorizing-accounts">Configuring accounts</a></li>
 <li><a href="#howto">How to …?</a></li>
 <li><a href="#known-problems">Known problems</a></li>
 <li><a href="#planned-features">Planned features</a></li>
@@ -68,7 +68,7 @@
 </ul>
 <p><br /></p>
 <h2>
-<a name="authorizing-accounts"></a>Authorizing accounts
+<a name="authorizing-accounts"></a>Configuring accounts
 </h2>
 <p>🌎 <a href="https://translate.google.com/translate?sl=en&amp;u=https%3A%2F%2Fm66b.github.io%2FFairEmail%2F%23authorizing-accounts">Google Translate</a></p>
 <p>In most cases, the quick setup wizard will be able to automatically identify the correct configuration.</p>
@@ -96,14 +96,14 @@
 <li>Yandex: please check if <a href="https://yandex.com/support/mail/mail-clients/others.html">IMAP is enabled</a></li>
 <li>Comcast/Xfinity: please check if <a href="https://www.xfinity.com/support/articles/third-party-email-access">third party email access</a> is enabled</li>
 </ul>
-<p>Please see <a href="#faq22">here</a> for common error messages and solutions.</p>
+<p>Please see <a href="#faq22">this FAQ</a> for common error messages and solutions, and please see <a href="#faq207">this FAQ</a> in case of ‘<em>Authentication failed</em>’ or similar.</p>
 <p>Related questions:</p>
 <ul>
 <li><a href="#faq111">Is OAuth supported?</a></li>
 <li><a href="#faq133">Why is ActiveSync ™ not supported?</a></li>
 </ul>
 <p><br /></p>
-<p><a name="howto"></p>
+<p><a name="howto"></a></p>
 <h2 id="how-to">How to …?</h2>
 <p>🌎 <a href="https://translate.google.com/translate?sl=en&amp;u=https%3A%2F%2Fm66b.github.io%2FFairEmail%2F%23howto">Google Translate</a></p>
 <ul>