diff --git a/ChangeLog b/ChangeLog
index 4bae43c848..814033328b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog
 + Added support for scatter charts
 + rfe #1478 Make Column Headings Sticky
 + rfe #1480 Enhance privileges initials table
++ rfe #1472 [interface] Break "Edit privileges" with sub-menus
 
 4.1.4.0 (not yet released)
 - bug #3840 (additional fix) When exporting to gzip format, the data is compressed 2 times
diff --git a/js/server_privileges.js b/js/server_privileges.js
index 5d45a81990..ceae30ab47 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -412,6 +412,7 @@ AJAX.registerOnload('server_privileges.js', function () {
                     PMA_highlightSQL($div);
                     $div = $('#edit_user_dialog');
                     displayPasswordGenerateButton();
+                    addOrUpdateSubmenu();
                     $(checkboxes_sel).trigger("change");
                     PMA_ajaxRemoveMessage($msgbox);
                     PMA_showHints($div);
@@ -687,4 +688,59 @@ AJAX.registerOnload('server_privileges.js', function () {
     });
 
     displayPasswordGenerateButton();
+
+    /*
+     * Create submenu for simpler interface
+     */
+    var addOrUpdateSubmenu = function () {
+        var $topmenu2 = $("#topmenu2"),
+            $edit_user_dialog = $("#edit_user_dialog"),
+            submenu_label,
+            submenu_link,
+            link_number;
+
+        // if submenu exists yet, remove it first
+        if ($topmenu2.length > 0) {
+            $topmenu2.remove();
+        }
+
+        // construct a submenu from the existing fieldsets
+        $topmenu2 = $("<ul/>").prop("id", "topmenu2");
+
+        $("#edit_user_dialog .submenu-item").each(function () {
+            submenu_label = $(this).find("legend[data-submenu-label]").data("submenu-label");
+
+            submenu_link = $("<a/>")
+            .prop("href", "#")
+            .html(submenu_label);
+
+            $("<li/>")
+            .append(submenu_link)
+            .appendTo($topmenu2);
+        });
+
+        // click handlers for submenu
+        $topmenu2.find("a").click(function (e) {
+            e.preventDefault();
+            // if already active, ignore click
+            if ($(this).hasClass("tabactive")) {
+                return;
+            }
+            $topmenu2.find("a").removeClass("tabactive");
+            $(this).addClass("tabactive");
+
+            // which section to show now?
+            link_number = $topmenu2.find("a").index($(this));
+            // hide all sections but the one to show
+            $("#edit_user_dialog .submenu-item").hide().eq(link_number).show();
+        });
+
+        // make first menu item active
+        // TODO: support URL hash history
+        $topmenu2.find("> :first-child a").addClass("tabactive");
+        $edit_user_dialog.prepend($topmenu2);
+
+        // hide all sections but the first
+        $("#edit_user_dialog .submenu-item").hide().eq(0).show();
+    };
 });
diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php
index 3d068d4c2a..c93fcab6b1 100644
--- a/libraries/display_change_password.lib.php
+++ b/libraries/display_change_password.lib.php
@@ -29,10 +29,14 @@ function PMA_getHtmlForChangePassword($username, $hostname)
                  ? 'onpropertychange'
                  : 'onchange';
 
+    $is_privileges = basename($_SERVER['SCRIPT_NAME']) === 'server_privileges.php';
+
     $html = '<form method="post" id="change_password_form" '
         . 'action="' . $GLOBALS['PMA_PHP_SELF'] . '" '
         . 'name="chgPassword" '
-        . 'class="ajax" >';
+        . 'class="ajax'
+        . ($is_privileges ? ' submenu-item' : '')
+        . '">';
 
     $html .= PMA_URL_getHiddenInputs();
 
@@ -43,7 +47,9 @@ function PMA_getHtmlForChangePassword($username, $hostname)
             . 'value="' . htmlspecialchars($hostname) . '" />';
     }
     $html .= '<fieldset id="fieldset_change_password">'
-        . '<legend>' . __('Change password') . '</legend>'
+        . '<legend'
+        . ($is_privileges ? ' data-submenu-label="' . __('Change password') . '"' : '')
+        . '>' . __('Change password') . '</legend>'
         . '<table class="data noclick">'
         . '<tr class="odd">'
         . '<td colspan="2">'
diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 7e1650ab4c..de53080489 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -578,7 +578,7 @@ function PMA_setUserGroup($username, $userGroup)
  *
  * @param string  $db     the database
  * @param string  $table  the table
- * @param boolean $submit wheather to display the submit button or not
+ * @param boolean $submit whether to display the submit button or not
  *
  * @global  array      $cfg         the phpMyAdmin configuration
  * @global  ressource  $user_link   the database connection
@@ -993,19 +993,24 @@ function PMA_getHtmlForGlobalOrDbSpecificPrivs($db, $table, $row)
             - (isset($row['Grant_priv']) ? 1 : 0)
         )
         . '" />';
-    $html_output .= '<fieldset id="fieldset_user_global_rights"><legend>';
+    $legend = $menu_label = '';
     if ($db == '*') {
-        $html_output .= __('Global privileges');
+        $legend     = __('Global privileges');
+        $menu_label = __('Global');
     } else if ($table == '*') {
-        $html_output .= __('Database-specific privileges');
+        $legend     = __('Database-specific privileges');
+        $menu_label = __('Database');
     } else {
-        $html_output .= __('Table-specific privileges');
+        $legend     = __('Table-specific privileges');
+        $menu_label = __('Table');
     }
-    $html_output .= '<input type="checkbox" id="addUsersForm_checkall" '
+    $html_output .= '<fieldset id="fieldset_user_global_rights">'
+        . '<legend data-submenu-label="' . $menu_label . '">' . $legend
+        . '<input type="checkbox" id="addUsersForm_checkall" '
         . 'class="checkall_box" title="' . __('Check All') . '" /> '
-        . '<label for="addUsersForm_checkall">' . __('Check All') . '</label> ';
-    $html_output .= '</legend>';
-    $html_output .= '<p><small><i>'
+        . '<label for="addUsersForm_checkall">' . __('Check All') . '</label> '
+        . '</legend>'
+        . '<p><small><i>'
         . __('Note: MySQL privilege names are expressed in English')
         . '</i></small></p>';
 
@@ -2456,16 +2461,16 @@ function PMA_getChangeLoginInformationHtmlForm($username, $hostname)
         )
     );
 
-    $class = ' ajax';
     $html_output = '<form action="server_privileges.php" '
-        . 'method="post" class="copyUserForm' . $class .'">' . "\n"
+        . 'method="post" class="copyUserForm ajax submenu-item">' . "\n"
         . PMA_URL_getHiddenInputs('', '')
         . '<input type="hidden" name="old_username" '
         . 'value="' . htmlspecialchars($username) . '" />' . "\n"
         . '<input type="hidden" name="old_hostname" '
         . 'value="' . htmlspecialchars($hostname) . '" />' . "\n"
         . '<fieldset id="fieldset_change_copy_user">' . "\n"
-        . '<legend>' . __('Change Login Information / Copy User')
+        . '<legend data-submenu-label="' . __('Login Information') . '">' . "\n"
+        . __('Change Login Information / Copy User')
         . '</legend>' . "\n"
         . PMA_getHtmlForLoginInformationFields('change');
 
@@ -2735,7 +2740,12 @@ function PMA_getHtmlForAllTableSpecificRights(
         . '<input type="hidden" name="hostname" '
         . 'value="' . htmlspecialchars($hostname) . '" />' . "\n"
         . '<fieldset>' . "\n"
-        . '<legend>'
+        . '<legend data-submenu-label="'
+        . (! strlen($dbname)
+            ? __('Database')
+            : __('Table')
+        )
+        . '">'
         . (! strlen($dbname)
             ? __('Database-specific privileges')
             : __('Table-specific privileges')
@@ -3924,7 +3934,6 @@ function PMA_getHtmlForUserProperties($dbname_is_wildcard,$url_dbname,
             //exit;
     }
 
-    $class = ' class="ajax"';
     $_params = array(
         'username' => $username,
         'hostname' => $hostname,
@@ -3936,8 +3945,8 @@ function PMA_getHtmlForUserProperties($dbname_is_wildcard,$url_dbname,
         }
     }
 
-    $html_output .= '<form' . $class . ' name="usersForm" id="addUsersForm"'
-        . ' action="server_privileges.php" method="post">' . "\n";
+    $html_output .= '<form class="ajax submenu-item" name="usersForm" '
+        . 'id="addUsersForm" action="server_privileges.php" method="post">' . "\n";
     $html_output .= PMA_URL_getHiddenInputs($_params);
     $html_output .= PMA_getHtmlToDisplayPrivilegesTable(
         PMA_ifSetOr($dbname, '*', 'length'),
@@ -3951,7 +3960,7 @@ function PMA_getHtmlForUserProperties($dbname_is_wildcard,$url_dbname,
         // no table name was given, display all table specific rights
         // but only if $dbname contains no wildcards
 
-        $html_output .= '<form action="server_privileges.php" '
+        $html_output .= '<form class="submenu-item" action="server_privileges.php" '
             . 'id="db_or_table_specific_priv" method="post">' . "\n";
 
         // unescape wildcards in dbname at table level
@@ -3996,7 +4005,7 @@ function PMA_getHtmlForUserProperties($dbname_is_wildcard,$url_dbname,
  * Get queries for Table privileges to change or copy user
  *
  * @param string $user_host_condition user host condition to
-                                      select relevent table privileges
+ *                                    select relevent table privileges
  * @param array  $queries             queries array
  * @param string $username            username
  * @param string $hostname            host name