diff --git a/js/functions.js b/js/functions.js
index 12831a132..164e98d55 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2007,8 +2007,9 @@ $(document).ready(function() {
      * Attach Ajax event handler for Change Password form submission
      *
      * @uses    PMA_ajaxShowMessage()
+     * @see $cfg['AjaxEnable']
      */
-    $("#change_password_form").find('input[name=change_pw]').live('click', function(event) {
+    $("#change_password_form.ajax").find('input[name=change_pw]').live('click', function(event) {
         event.preventDefault();
 
         /**
diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php
index e7bdad29e..4dcb2c907 100644
--- a/libraries/display_change_password.lib.php
+++ b/libraries/display_change_password.lib.php
@@ -19,7 +19,7 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5)
 
 // Displays the form
 ?>
-<form method="post" id="change_password_form" action="<?php echo $GLOBALS['PMA_PHP_SELF']; ?>" name="chgPassword" onsubmit="return checkPassword(this)">
+    <form method="post" id="change_password_form" action="<?php echo $GLOBALS['PMA_PHP_SELF']; ?>" name="chgPassword" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? 'class="ajax" ' : ''); ?> onsubmit="return checkPassword(this)">
     <?php   echo PMA_generate_common_hidden_inputs();
             if (strpos($GLOBALS['PMA_PHP_SELF'], 'server_privileges') !== false) {
                 echo '<input type="hidden" name="username" value="' . htmlspecialchars($username) . '" />' . "\n"