diff --git a/js/functions.js b/js/functions.js
index 07c623766..28e89f087 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2016,11 +2016,7 @@ $(document).ready(function() {
 
         $.post($(the_form).attr('action'), $(the_form).serialize() + '&change_pw='+ this_value, function(data) {
             if(data.success == true) {
-
-                PMA_ajaxShowMessage(data.message);
-
                 $("#topmenucontainer").after(data.sql_query);
-
                 $("#change_password_dialog").hide().remove();
                 $("#edit_user_dialog").dialog("close").remove();
             }
diff --git a/user_password.php b/user_password.php
index d3b577b7c..9787cc1a4 100644
--- a/user_password.php
+++ b/user_password.php
@@ -110,7 +110,7 @@ if (isset($_REQUEST['nopass'])) {
         $message = PMA_Message::success(__('The profile has been updated.'));
 
         if($GLOBALS['is_ajax_request'] == true) {
-            $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query, 'success');
+            $extra_data['sql_query'] = PMA_showMessage($message, $sql_query, 'success');
             PMA_ajaxResponse($message, true, $extra_data);
         }