diff --git a/user_password.php b/user_password.php
index df8cd8b3eb45..6b142e3c44b9 100644
--- a/user_password.php
+++ b/user_password.php
@@ -180,6 +180,9 @@ function PMA_changePassword($password, $message, $change_password_message)
             $value = 0;
         }
         $GLOBALS['dbi']->tryQuery('SET `old_passwords` = ' . $value . ';');
+
+        $sql_query = 'SET password = '
+            . (($password == '') ? '\'\'' : $hashing_function . '(\'***\')');
     }
 
     PMA_changePassUrlParamsAndSubmitQuery(