diff --git a/js/functions.js b/js/functions.js
index 11640867de..a2dde56406 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2410,17 +2410,25 @@ jQuery.fn.PMA_confirm = function (question, url, callbackFn) {
      * @var    button_options  Object that stores the options passed to jQueryUI
      *                          dialog
      */
-    var button_options = {};
-    button_options[PMA_messages.strOK] = function () {
-        $(this).dialog("close");
-
-        if ($.isFunction(callbackFn)) {
-            callbackFn.call(this, url);
+    var button_options = [
+        {
+            text: PMA_messages.strOK,
+            'class': 'submitOK',
+            click: function () {
+                $(this).dialog("close");
+                if ($.isFunction(callbackFn)) {
+                    callbackFn.call(this, url);
+                }
+            }
+        },
+        {
+              text: PMA_messages.strCancel,
+              'class': 'submitCancel',
+              click: function () {
+                  $(this).dialog("close");
+            }
         }
-    };
-    button_options[PMA_messages.strCancel] = function () {
-        $(this).dialog("close");
-    };
+    ];
 
     $('<div/>', {'id': 'confirm_dialog'})
     .prepend(question)
diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 5f08ea40e3..18938ace83 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2684,7 +2684,7 @@ function PMA_getHtmlForUserRights($db_rights, $dbname,
 ) {
     $html_output = '';
     $found_rows = array();
-    
+
     // display rows
     if (count($db_rights) < 1) {
         $html_output .= '<tr class="odd">' . "\n"
@@ -3813,12 +3813,12 @@ function PMA_getAddUserHtmlFieldset($db = '', $table = '')
 
     return '<fieldset id="fieldset_add_user">' . "\n"
         . '<legend>' . _pgettext('Create new user', 'New') . '</legend>'
-        . '<a href="server_privileges.php'
+        . '<a id="add_user_anchor" href="server_privileges.php'
         . PMA_URL_getCommon($url_params) . '" '
         . (!empty($rel_params)
             ? ('rel="' . PMA_URL_getCommon($rel_params) . '" ')
             : '')
-        . '">' . "\n"
+        . '>' . "\n"
         . PMA_Util::getIcon('b_usradd.png')
         . '            ' . __('Add user') . '</a>' . "\n"
         . '</fieldset>' . "\n";
diff --git a/test/selenium/PmaSeleniumCreateRemoveUserTest.php b/test/selenium/PmaSeleniumCreateRemoveUserTest.php
index f13be74c4f..629606e87a 100644
--- a/test/selenium/PmaSeleniumCreateRemoveUserTest.php
+++ b/test/selenium/PmaSeleniumCreateRemoveUserTest.php
@@ -59,7 +59,7 @@ class PMA_SeleniumCreateRemoveUserTest extends PMA_SeleniumBase
         $this->login();
         $this->waitForElement('byLinkText', "Users")->click();
 
-        $link = $this->waitForElement("byLinkText", "Add user");
+        $link = $this->waitForElement("byId", "add_user_anchor");
         $link->click();
 
         $userField = $this->waitForElement("byName", "username");
@@ -92,8 +92,9 @@ class PMA_SeleniumCreateRemoveUserTest extends PMA_SeleniumBase
         )->click();
 
         $this->byId("checkbox_drop_users_db")->click();
-        $this->acceptAlert();
         $this->byId("buttonGo")->click();
+        $this->waitForElement("byCssSelector", "button.confirmOK")->click();
+        $this->acceptAlert();
 
         $success = $this->waitForElement("byCssSelector", "div.success");
         $this->assertContains(