diff --git a/ChangeLog b/ChangeLog
index 4d704906ee..f072d63c80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog
 + rfe #3484063 Null checkbox behavior
 + Patch #3497179 Contest-5: Add user: Allow create DB w/same name + grant u_%
 + Patch #3498201 Contest-6: Export all privileges
++ Patch #3502814 for rfe #3187077 Change password buttons should match
 
 3.5.0.0 (not yet released)
 + rfe #2021981 [interface] Add support for mass prefix change.
diff --git a/js/functions.js b/js/functions.js
index 6ed3661ed1..74231a74bc 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2347,28 +2347,8 @@ $(document).ready(function() {
          * @var button_options  Object containing options to be passed to jQueryUI's dialog
          */
         var button_options = {};
-        button_options[PMA_messages['strCancel']] = function() {$(this).dialog('close').remove();}
-        $.get($(this).attr('href'), {'ajax_request': true}, function(data) {
-            $('<div id="change_password_dialog"></div>')
-            .dialog({
-                title: PMA_messages['strChangePassword'],
-                width: 600,
-                close: function(ev,ui) {$(this).remove();},
-                buttons : button_options,
-                beforeClose: function(ev,ui){ $('#change_password_anchor.dialog_active').removeClass('dialog_active').addClass('ajax')}
-            })
-            .append(data);
-            displayPasswordGenerateButton();
-        }) // end $.get()
-    }) // end handler for change password anchor
-
-    /**
-     * Attach Ajax event handler for Change Password form submission
-     *
-     * @uses    PMA_ajaxShowMessage()
-     * @see $cfg['AjaxEnable']
-     */
-    $("#change_password_form.ajax").find('input[name=change_pw]').live('click', function(event) {
+        button_options[PMA_messages['strGo']] = function() {
+            
         event.preventDefault();
 
         /**
@@ -2398,7 +2378,29 @@ $(document).ready(function() {
                 PMA_ajaxShowMessage(data.error, false);
             }
         }) // end $.post()
-    }) // end handler for Change Password form submission
+            
+        }
+        button_options[PMA_messages['strCancel']] = function() {$(this).dialog('close').remove();}
+        $.get($(this).attr('href'), {'ajax_request': true}, function(data) {
+            $('<div id="change_password_dialog"></div>')
+            .dialog({
+                title: PMA_messages['strChangePassword'],
+                width: 600,
+                close: function(ev,ui) {$(this).remove();},
+                buttons : button_options,
+                beforeClose: function(ev,ui){ $('#change_password_anchor.dialog_active').removeClass('dialog_active').addClass('ajax')}
+            })
+            .append(data);
+            displayPasswordGenerateButton();
+        }) // end $.get()
+    }) // end handler for change password anchor
+
+    /**
+     * Attach Ajax event handler for Change Password form submission
+     *
+     * @uses    PMA_ajaxShowMessage()
+     * @see $cfg['AjaxEnable']
+     */
 }) // end $(document).ready() for Change Password
 
 /**
diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php
index 3397dd0efb..947514867b 100644
--- a/libraries/display_change_password.lib.php
+++ b/libraries/display_change_password.lib.php
@@ -68,7 +68,8 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5)
         </tr>
         </table>
     </fieldset>
-    <fieldset id="fieldset_change_password_footer" class="tblFooters">
-            <input type="submit" name="change_pw" value="<?php echo(__('Go')); ?>" />
-    </fieldset>
+<!--    <fieldset id="fieldset_change_password_footer" class="tblFooters">
+	    <input type="submit" name="change_pw" value="<?php //echo(__('Go')); ?>" />
+	    <button aria-disabled="false" name="change_pw" role="button" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" type="submit"><span class="ui-button-text">Go</span></button>
+    </fieldset>-->
 </form>