diff --git a/user_password.php b/user_password.php
index 1c64703659..93149947bb 100644
--- a/user_password.php
+++ b/user_password.php
@@ -156,6 +156,9 @@ function PMA_changePassword($password, $message, $change_password_message)
         );
     }
 
+    $sql_query = 'SET password = '
+        . (($password == '') ? '\'\'' : $hashing_function . '(\'***\')');
+
     if ($serverType == 'MySQL'
         && PMA_MYSQL_INT_VERSION >= 50706
     ) {
@@ -178,8 +181,7 @@ function PMA_changePassword($password, $message, $change_password_message)
         }
         $GLOBALS['dbi']->tryQuery('SET `old_passwords` = ' . $value . ';');
     }
-        $sql_query = 'SET password = '
-            . (($password == '') ? '\'\'' : $hashing_function . '(\'***\')');
+
     PMA_changePassUrlParamsAndSubmitQuery(
         $username, $hostname, $password,
         $sql_query, $hashing_function, $orig_auth_plugin