diff --git a/doc/config.rst b/doc/config.rst
index f2308b1eab..d71d6687d7 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -1444,9 +1444,9 @@ Navigation panel setup
     :type: boolean
     :default: true
 
-    Enables Zero Configuration mode in which user will be offered a choice to
+    Enables Zero Configuration mode in which the user will be offered a choice to
     create phpMyAdmin configuration storage in the current database
-    or use existing, if already present.
+    or use the existing one, if already present.
 
     .. note::
     If there is no central configuration storage defined then you may end up with
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 58f9b72667..a1dbfc453e 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -787,7 +787,7 @@ $strConfigCaptchaLoginPrivateKey_name = __('Private key for reCaptcha');
 $strConfigSendErrorReports_desc = __('Choose the default action when sending error reports.');
 $strConfigSendErrorReports_name = __('Send error reports');
 $strConfigZeroConf_desc = __(
-    'Enable Zero Configuration mode which lets you to setup phpMyAdmin '
+    'Enable Zero Configuration mode which lets you setup phpMyAdmin '
     . 'configuration storage tables automatically.'
 );
 $strConfigZeroConf_name = __('Enable Zero Configuration mode');