Merge branch 'QA_4_5'

Conflicts:
	server_privileges.php

1 files changed, 7 insertions, 2 deletions

diff --git a/server_privileges.php b/server_privileges.php
index 47e4c5a665..b66c2a329c 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -140,8 +140,13 @@ if (isset($_REQUEST['change_copy']) && $username == $_REQUEST['old_username']
     && $hostname == $_REQUEST['old_hostname']
 ) {
     $response->addHTML(
-        PMA\libraries\Message::error(__('Username and hostname didn\'t change.'))
-            ->getDisplay()
+        PMA\libraries\Message::error(
+            __(
+                "Username and hostname didn't change. "
+                . "If you only want to change the password, "
+                . "'Change password' tab should be used."
+            )
+        )->getDisplay()
     );
     $response->setRequestStatus(false);
     exit;