diff --git a/ChangeLog b/ChangeLog
index 3bce7e4489..b8470aac3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -57,6 +57,7 @@ phpMyAdmin - ChangeLog
 - issue        Fix typo in a condition in the Sql class
 - issue #15996 Fix local setup doc links pointing to a wrong location
 - issue #16093 Fix error importing utf-8 with bom sql file
+- issue #16089 2FA UX enhancement: autofocus 2FA input
 
 5.0.2 (2020-03-20)
 - issue        Fixed deprecation warning "implode(): Passing glue string after array is deprecated." function on export page
diff --git a/libraries/classes/Config/FormDisplay.php b/libraries/classes/Config/FormDisplay.php
index 01b7ee37f4..174fd19f66 100644
--- a/libraries/classes/Config/FormDisplay.php
+++ b/libraries/classes/Config/FormDisplay.php
@@ -814,7 +814,7 @@ class FormDisplay
         return MySQLDocumentation::getDocumentationLink(
             'config',
             'cfg_' . $this->_getOptName($path),
-            '../'
+            Sanitize::isSetup() ? '../' : ''
         );
     }
 
diff --git a/libraries/classes/Sanitize.php b/libraries/classes/Sanitize.php
index 5afc0803b0..170e016afe 100644
--- a/libraries/classes/Sanitize.php
+++ b/libraries/classes/Sanitize.php
@@ -83,7 +83,7 @@ class Sanitize
      *
      * @return bool
      */
-    private static function isSetup(): bool
+    public static function isSetup(): bool
     {
         return $GLOBALS['PMA_Config'] !== null && $GLOBALS['PMA_Config']->get('is_setup');
     }