diff --git a/examples/create_tables.sql b/examples/create_tables.sql
index ca23e71c06..0ac5654dc4 100644
--- a/examples/create_tables.sql
+++ b/examples/create_tables.sql
@@ -262,43 +262,9 @@ CREATE TABLE IF NOT EXISTS `pma__users` (
 
 CREATE TABLE IF NOT EXISTS `pma__usergroups` (
   `usergroup` varchar(64) NOT NULL,
-  `server_databases` enum('Y','N') NOT NULL DEFAULT 'N',
-  `server_sql` enum('Y','N') NOT NULL DEFAULT 'N',
-  `server_status` enum('Y','N') NOT NULL DEFAULT 'N',
-  `server_rights` enum('Y','N') NOT NULL DEFAULT 'N',
-  `server_export` enum('Y','N') NOT NULL DEFAULT 'N',
-  `server_import` enum('Y','N') NOT NULL DEFAULT 'N',
-  `server_settings` enum('Y','N') NOT NULL DEFAULT 'N',
-  `server_binlog` enum('Y','N') NOT NULL DEFAULT 'N',
-  `server_replication` enum('Y','N') NOT NULL DEFAULT 'N',
-  `server_vars` enum('Y','N') NOT NULL DEFAULT 'N',
-  `server_charset` enum('Y','N') NOT NULL DEFAULT 'N',
-  `server_plugins` enum('Y','N') NOT NULL DEFAULT 'N',
-  `server_engine` enum('Y','N') NOT NULL DEFAULT 'N',
-  `db_structure` enum('Y','N') NOT NULL DEFAULT 'N',
-  `db_sql` enum('Y','N') NOT NULL DEFAULT 'N',
-  `db_search` enum('Y','N') NOT NULL DEFAULT 'N',
-  `db_qbe` enum('Y','N') NOT NULL DEFAULT 'N',
-  `db_export` enum('Y','N') NOT NULL DEFAULT 'N',
-  `db_import` enum('Y','N') NOT NULL DEFAULT 'N',
-  `db_operation` enum('Y','N') NOT NULL DEFAULT 'N',
-  `db_privileges` enum('Y','N') NOT NULL DEFAULT 'N',
-  `db_routines` enum('Y','N') NOT NULL DEFAULT 'N',
-  `db_events` enum('Y','N') NOT NULL DEFAULT 'N',
-  `db_triggers` enum('Y','N') NOT NULL DEFAULT 'N',
-  `db_tracking` enum('Y','N') NOT NULL DEFAULT 'N',
-  `db_designer` enum('Y','N') NOT NULL DEFAULT 'N',
-  `table_browse` enum('Y','N') NOT NULL DEFAULT 'N',
-  `table_structure` enum('Y','N') NOT NULL DEFAULT 'N',
-  `table_sql` enum('Y','N') NOT NULL DEFAULT 'N',
-  `table_search` enum('Y','N') NOT NULL DEFAULT 'N',
-  `table_insert` enum('Y','N') NOT NULL DEFAULT 'N',
-  `table_export` enum('Y','N') NOT NULL DEFAULT 'N',
-  `table_import` enum('Y','N') NOT NULL DEFAULT 'N',
-  `table_operation` enum('Y','N') NOT NULL DEFAULT 'N',
-  `table_tracking` enum('Y','N') NOT NULL DEFAULT 'N',
-  `table_triggers` enum('Y','N') NOT NULL DEFAULT 'N',
-  PRIMARY KEY (`usergroup`)
+  `tab` varchar(64) NOT NULL,
+  `allowed` enum('Y','N') NOT NULL DEFAULT 'N',
+  PRIMARY KEY (`usergroup`,`tab`,`allowed`)
 ) 
   COMMENT='User groups with configured menu items'
   DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
diff --git a/examples/create_tables_drizzle.sql b/examples/create_tables_drizzle.sql
index 4bbb9c34d5..698a15949d 100644
--- a/examples/create_tables_drizzle.sql
+++ b/examples/create_tables_drizzle.sql
@@ -248,43 +248,9 @@ CREATE TABLE IF NOT EXISTS `pma__users` (
 
 CREATE TABLE IF NOT EXISTS `pma__usergroups` (
   `usergroup` varchar(64) NOT NULL,
-  `server_databases` enum('Y','N') NOT NULL DEFAULT 'N',
-  `server_sql` enum('Y','N') NOT NULL DEFAULT 'N',
-  `server_status` enum('Y','N') NOT NULL DEFAULT 'N',
-  `server_rights` enum('Y','N') NOT NULL DEFAULT 'N',
-  `server_export` enum('Y','N') NOT NULL DEFAULT 'N',
-  `server_import` enum('Y','N') NOT NULL DEFAULT 'N',
-  `server_settings` enum('Y','N') NOT NULL DEFAULT 'N',
-  `server_binlog` enum('Y','N') NOT NULL DEFAULT 'N',
-  `server_replication` enum('Y','N') NOT NULL DEFAULT 'N',
-  `server_vars` enum('Y','N') NOT NULL DEFAULT 'N',
-  `server_charset` enum('Y','N') NOT NULL DEFAULT 'N',
-  `server_plugins` enum('Y','N') NOT NULL DEFAULT 'N',
-  `server_engine` enum('Y','N') NOT NULL DEFAULT 'N',
-  `db_structure` enum('Y','N') NOT NULL DEFAULT 'N',
-  `db_sql` enum('Y','N') NOT NULL DEFAULT 'N',
-  `db_search` enum('Y','N') NOT NULL DEFAULT 'N',
-  `db_qbe` enum('Y','N') NOT NULL DEFAULT 'N',
-  `db_export` enum('Y','N') NOT NULL DEFAULT 'N',
-  `db_import` enum('Y','N') NOT NULL DEFAULT 'N',
-  `db_operation` enum('Y','N') NOT NULL DEFAULT 'N',
-  `db_privileges` enum('Y','N') NOT NULL DEFAULT 'N',
-  `db_routines` enum('Y','N') NOT NULL DEFAULT 'N',
-  `db_events` enum('Y','N') NOT NULL DEFAULT 'N',
-  `db_triggers` enum('Y','N') NOT NULL DEFAULT 'N',
-  `db_tracking` enum('Y','N') NOT NULL DEFAULT 'N',
-  `db_designer` enum('Y','N') NOT NULL DEFAULT 'N',
-  `table_browse` enum('Y','N') NOT NULL DEFAULT 'N',
-  `table_structure` enum('Y','N') NOT NULL DEFAULT 'N',
-  `table_sql` enum('Y','N') NOT NULL DEFAULT 'N',
-  `table_search` enum('Y','N') NOT NULL DEFAULT 'N',
-  `table_insert` enum('Y','N') NOT NULL DEFAULT 'N',
-  `table_export` enum('Y','N') NOT NULL DEFAULT 'N',
-  `table_import` enum('Y','N') NOT NULL DEFAULT 'N',
-  `table_operation` enum('Y','N') NOT NULL DEFAULT 'N',
-  `table_tracking` enum('Y','N') NOT NULL DEFAULT 'N',
-  `table_triggers` enum('Y','N') NOT NULL DEFAULT 'N',
-  PRIMARY KEY (`usergroup`)
+  `tab` varchar(64) NOT NULL,
+  `allowed` enum('Y','N') NOT NULL DEFAULT 'N',
+  PRIMARY KEY (`usergroup`,`tab`,`allowed`)
 ) 
   COMMENT='User groups with configured menu items'
   COLLATE utf8_bin;
diff --git a/libraries/Menu.class.php b/libraries/Menu.class.php
index 4c4ee18ebf..3894b557ab 100644
--- a/libraries/Menu.class.php
+++ b/libraries/Menu.class.php
@@ -140,19 +140,16 @@ class PMA_Menu
             $userTable = PMA_Util::backquote($GLOBALS['cfg']['Server']['pmadb'])
                 . "." . PMA_Util::backquote($GLOBALS['cfg']['Server']['users']);
 
-            $sql_query = "SELECT * FROM " . $groupTable
-                . " WHERE `usergroup` = (SELECT usergroup FROM "
+            $sql_query = "SELECT `tab` FROM " . $groupTable
+                . " WHERE `allowed` = 'N' AND `usergroup` = (SELECT usergroup FROM "
                 . $userTable . " WHERE `username` = '"
                 . PMA_Util::sqlAddSlashes($GLOBALS['cfg']['Server']['user']) . "')";
 
             $result = PMA_queryAsControlUser($sql_query, false);
             if ($result) {
-                $row = $GLOBALS['dbi']->fetchAssoc($result);
-                foreach ($allowedTabs as $key => $tab) {
-                    $colName = $level . '_' . $key;
-                    if (isset($row[$colName]) && $row[$colName] == 'N') {
-                        unset($allowedTabs[$key]);
-                    }
+                while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
+                    $tabName = substr($row['tab'], strpos($row['tab'], '_') + 1);
+                    unset($allowedTabs[$tabName]);
                 }
             }
         }
diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 18483b8dcd..66e3595285 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -500,7 +500,7 @@ function PMA_getHtmlToChooseUserGroup($username)
         . "." . PMA_Util::backquote($GLOBALS['cfg']['Server']['users']);
 
     $userGroups = array();
-    $sql_query = "SELECT `usergroup` FROM " . $groupTable;
+    $sql_query = "SELECT DISTINCT `usergroup` FROM " . $groupTable;
     $result = PMA_queryAsControlUser($sql_query, false);
     if ($result) {
         while ($row = $GLOBALS['dbi']->fetchRow($result)) {
@@ -1929,7 +1929,7 @@ function PMA_getHtmlForSpecificTablePrivileges($db, $table)
 
     list($list_of_privileges, $list_of_compared_privileges)
         = PMA_getListOfPrivilegesAndComparedPrivileges();
-    $sql_query 
+    $sql_query
         = "("
         . " SELECT " . $list_of_privileges . ", '*' AS `Db`, 'g' AS `Type`"
         . " FROM `mysql`.`user`"
@@ -3801,342 +3801,6 @@ function PMA_getHtmlForDisplayUserOverviewPage($pmaThemeImage, $text_dir)
     return $html_output;
 }
 
-/**
- * Return HTML to list the users belonging to a given user group
- *
- * @param string $userGroup user group name
- *
- * @return HTML to list the users belonging to a given user group
- */
-function PMA_getHtmlForListingUsersofAGroup($userGroup)
-{
-    $html_output  = '<h2>'
-        . sprintf(__('Users of \'%s\' user group'), htmlspecialchars($userGroup))
-        . '</h2>';
-
-    $usersTable = PMA_Util::backquote($GLOBALS['cfg']['Server']['pmadb'])
-        . "." . PMA_Util::backquote($GLOBALS['cfg']['Server']['users']);
-    $sql_query = "SELECT `username` FROM " . $usersTable
-        . " WHERE `usergroup`='" . PMA_Util::sqlAddSlashes($userGroup) . "'";
-    $result = PMA_queryAsControlUser($sql_query, false);
-    if ($result) {
-        if ($GLOBALS['dbi']->numRows($result) == 0) {
-            $html_output .= '<p>'
-                . __('No users were found belonging to this user group.')
-                . '</p>';
-        } else {
-            $html_output .= '<table>'
-                . '<thead><tr><th>#</th><th>' . __('User') . '</th></tr></thead>'
-                . '<tbody>';
-            $i = 0;
-            while ($row = $GLOBALS['dbi']->fetchRow($result)) {
-                $i++;
-                $html_output .= '<tr>'
-                    . '<td>' . $i . ' </td>'
-                    . '<td>' . htmlspecialchars($row[0]) . '</td>'
-                    . '</tr>';
-            }
-            $html_output .= '</tbody>'
-                . '</table>';
-        }
-    }
-    $GLOBALS['dbi']->freeResult($result);
-    return $html_output;
-}
-
-/**
- * Returns HTML for the 'user groups' table
- *
- * @return string HTML for the 'user groups' table
- */
-function PMA_getHtmlForUserGroupsTable()
-{
-    $tabs = PMA_Util::getMenuTabList();
-
-    $html_output  = '<h2>' . __('User groups') . '</h2>';
-    $groupTable = PMA_Util::backquote($GLOBALS['cfg']['Server']['pmadb'])
-        . "." . PMA_Util::backquote($GLOBALS['cfg']['Server']['usergroups']);
-    $sql_query = "SELECT * FROM " . $groupTable . " ORDER BY `usergroup` ASC";
-    $result = PMA_queryAsControlUser($sql_query, false);
-
-    if ($result && $GLOBALS['dbi']->numRows($result)) {
-        $html_output .= '<form name="userGroupsForm" id="userGroupsForm"'
-            . ' action="server_privileges.php" method="post">';
-        $html_output .= PMA_URL_getHiddenInputs();
-        $html_output .= '<table id="userGroupsTable">';
-        $html_output .= '<thead><tr>';
-        $html_output .= '<th style="white-space: nowrap">'
-            . __('User group') . '</th>';
-        $html_output .= '<th>' . __('Server level tabs') . '</th>';
-        $html_output .= '<th>' . __('Database level tabs') . '</th>';
-        $html_output .= '<th>' . __('Table level tabs') . '</th>';
-        $html_output .= '<th>' . __('Action') . '</th>';
-        $html_output .= '</tr></thead>';
-        $html_output .= '<tbody>';
-
-        $odd = true;
-        while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
-            $html_output .= '<tr class="' . ($odd ? 'odd' : 'even') . '">';
-            $html_output .= '<td>' . htmlspecialchars($row['usergroup']) . '</td>';
-            $html_output .= '<td>' . _getAllowedTabNames($row, 'server') . '</td>';
-            $html_output .= '<td>' . _getAllowedTabNames($row, 'db') . '</td>';
-            $html_output .= '<td>' . _getAllowedTabNames($row, 'table') . '</td>';
-
-            $html_output .= '<td>';
-            $html_output .= '<a class="" href="server_user_groups.php'
-                . PMA_URL_getCommon(
-                    array(
-                        'viewUsers' => 1, 'userGroup' => $row['usergroup']
-                    )
-                )
-                . '">'
-                . PMA_Util::getIcon('b_usrlist.png', __('View users')) . '</a>';
-            $html_output .= '&nbsp;&nbsp;';
-            $html_output .= '<a class="" href="server_user_groups.php'
-                . PMA_URL_getCommon(
-                    array(
-                        'editUserGroup' => 1, 'userGroup' => $row['usergroup']
-                    )
-                )
-                . '">'
-                . PMA_Util::getIcon('b_edit.png', __('Edit')) . '</a>';
-            $html_output .= '&nbsp;&nbsp;';
-            $html_output .= '<a class="deleteUserGroup ajax"'
-                . ' href="server_user_groups.php'
-                . PMA_URL_getCommon(
-                    array(
-                        'deleteUserGroup' => 1, 'userGroup' => $row['usergroup']
-                    )
-                )
-                . '">'
-                . PMA_Util::getIcon('b_drop.png', __('Delete')) . '</a>';
-            $html_output .= '</td>';
-
-            $html_output .= '</tr>';
-
-            $odd = ! $odd;
-        }
-
-        $html_output .= '</tbody>';
-        $html_output .= '</table>';
-        $html_output .= '</form>';
-    }
-    $GLOBALS['dbi']->freeResult($result);
-
-    $html_output .= '<fieldset id="fieldset_add_user_group">';
-    $html_output .= '<a href="server_user_groups.php'
-        . PMA_URL_getCommon(array('addUserGroup' => 1)) . '">'
-        . PMA_Util::getIcon('b_usradd.png')
-        . __('Add user group') . '</a>';
-    $html_output .= '</fieldset>';
-
-    return $html_output;
-}
-
-/**
- * Returns the list of allowed menu tab names
- * based on a data row from usergroup table.
- *
- * @param array  $row   row of usergroup table
- * @param string $level 'server', 'db' or 'table'
- *
- * @return string comma seperated list of allowed menu tab names
- */
-function _getAllowedTabNames($row, $level)
-{
-    $tabNames = array();
-    $tabs = PMA_Util::getMenuTabList($level);
-    foreach ($tabs as $tab => $tabName) {
-        if (! isset($row[$level . '_' . $tab])
-            || $row[$level . '_' . $tab] == 'Y'
-        ) {
-            $tabNames[] = $tabName;
-        }
-    }
-    return implode(', ', $tabNames);
-}
-
-/**
- * Deletes a user group
- *
- * @param string $userGroup user group name
- *
- * @return void
- */
-function PMA_deleteUserGroup($userGroup)
-{
-    $userTable = PMA_Util::backquote($GLOBALS['cfg']['Server']['pmadb'])
-        . "." . PMA_Util::backquote($GLOBALS['cfg']['Server']['users']);
-    $groupTable = PMA_Util::backquote($GLOBALS['cfg']['Server']['pmadb'])
-        . "." . PMA_Util::backquote($GLOBALS['cfg']['Server']['usergroups']);
-    $sql_query = "DELETE FROM " . $userTable
-        . " WHERE `usergroup`='" . PMA_Util::sqlAddSlashes($userGroup) . "'";
-    PMA_queryAsControlUser($sql_query, true);
-    $sql_query = "DELETE FROM " . $groupTable
-        . " WHERE `usergroup`='" . PMA_Util::sqlAddSlashes($userGroup) . "'";
-    PMA_queryAsControlUser($sql_query, true);
-}
-
-/**
- * Returns HTML for add/edit user group dialog
- *
- * @param string $userGroup name of the user group in case of editing
- *
- * @return string HTML for add/edit user group dialog
- */
-function PMA_getHtmlToEditUserGroup($userGroup = null)
-{
-    $html_output = '';
-    if ($userGroup == null) {
-        $html_output .= '<h2>' . __('Add user group') . '</h2>';
-    } else {
-        $html_output .= '<h2>'
-            . sprintf(__('Edit user group: \'%s\''), htmlspecialchars($userGroup))
-            . '</h2>';
-    }
-
-    $html_output .= '<form name="userGroupForm" id="userGroupForm"'
-        . ' action="server_user_groups.php" method="post">';
-    $urlParams = array();
-    if ($userGroup != null) {
-        $urlParams['userGroup'] = $userGroup;
-        $urlParams['editUserGroupSubmit'] = '1';
-    } else {
-        $urlParams['addUserGroupSubmit'] = '1';
-    }
-    $html_output .= PMA_URL_getHiddenInputs($urlParams);
-
-    $html_output .= '<fieldset id="fieldset_user_group_rights">';
-    $html_output .= '<legend>' . __('User group menu assignments')
-        . '&nbsp;&nbsp;&nbsp;'
-        . '<input type="checkbox" class="checkall_box" title="Check All">'
-        . '<label for="addUsersForm_checkall">' . __('Check All') .'</label>'
-        . '</legend>';
-
-    if ($userGroup == null) {
-        $html_output .= '<label for="userGroup">' . __('Group name:') . '</label>';
-        $html_output .= '<input type="text" name="userGroup" '
-            . 'autocomplete="off" required="required" />';
-        $html_output .= '<div class="clearfloat"></div>';
-    }
-
-    $allowedTabs = array(
-        'server' => array(),
-        'db'     => array(),
-        'table'	 => array()
-    );
-    if ($userGroup != null) {
-        $groupTable = PMA_Util::backquote($GLOBALS['cfg']['Server']['pmadb'])
-            . "." . PMA_Util::backquote($GLOBALS['cfg']['Server']['usergroups']);
-        $sql_query = "SELECT * FROM " . $groupTable
-            . " WHERE `usergroup`='" . PMA_Util::sqlAddSlashes($userGroup) . "'";
-        $result = PMA_queryAsControlUser($sql_query, false);
-        if ($result) {
-            $row = $GLOBALS['dbi']->fetchAssoc($result);
-            foreach ($row as $key => $value) {
-                if (substr($key, 0, 7) == 'server_' && $value == 'Y') {
-                    $allowedTabs['server'][] = substr($key, 7);
-                } elseif (substr($key, 0, 3) == 'db_' && $value == 'Y') {
-                    $allowedTabs['db'][] = substr($key, 3);
-                } elseif (substr($key, 0, 6) == 'table_' && $value == 'Y') {
-                    $allowedTabs['table'][] = substr($key, 6);
-                }
-            }
-        }
-        $GLOBALS['dbi']->freeResult($result);
-    }
-
-    $html_output .= _getTabList(
-        __('Server-level tabs'), 'server', $allowedTabs['server']
-    );
-    $html_output .= _getTabList(
-        __('Database-level tabs'), 'db', $allowedTabs['db']
-    );
-    $html_output .= _getTabList(
-        __('Table-level tabs'), 'table', $allowedTabs['table']
-    );
-
-    $html_output .= '</fieldset>';
-
-    $html_output .= '<fieldset id="fieldset_user_group_rights_footer"'
-        . ' class="tblFooters">';
-    $html_output .= '<input type="submit" name="update_privs" value="Go">';
-    $html_output .= '</fieldset>';
-
-    return $html_output;
-}
-
-/**
- * Returns HTML for checkbox groups to choose
- * tabs of 'server', 'db' or 'table' levels.
- *
- * @param string $title    title of the checkbox group
- * @param string $level    'server', 'db' or 'table'
- * @param array  $selected array of selected allowed tabs
- *
- * @return string HTML for checkbox groups
- */
-function _getTabList($title, $level, $selected)
-{
-    $tabs = PMA_Util::getMenuTabList($level);
-    $html_output = '<fieldset>';
-    $html_output .= '<legend>' . $title . '</legend>';
-    foreach ($tabs as $tab => $tabName) {
-        $html_output .= '<div class="item">';
-        $html_output .= '<input type="checkbox" class="checkall"'
-            . (in_array($tab, $selected) ? ' checked="checked"' : '')
-            . ' name="' . $level . '_' . $tab .  '" value="Y" />';
-        $html_output .= '<label for="' . $level . '_' . $tab .  '">'
-            . '<code>' . $tabName . '</code>'
-            . '</label>';
-        $html_output .= '</div>';
-    }
-    $html_output .= '</fieldset>';
-    return $html_output;
-}
-
-/**
- * Add/update a user group with allowed menu tabs.
- *
- * @param string  $userGroup user group name
- * @param boolean $new       whether this is a new user group
- *
- * @return void
- */
-function PMA_editUserGroup($userGroup, $new = false)
-{
-    $tabs = PMA_Util::getMenuTabList();
-    $groupTable = PMA_Util::backquote($GLOBALS['cfg']['Server']['pmadb'])
-        . "." . PMA_Util::backquote($GLOBALS['cfg']['Server']['usergroups']);
-
-    $cols = "";
-    $vals = "";
-    $colsNvals = "";
-    foreach ($tabs as $tabGroupName => $tabGroup) {
-        foreach ($tabs[$tabGroupName] as $tab => $tabName) {
-            $colName = $tabGroupName . '_' . $tab;
-            $cols .= "," . PMA_Util::backquote($colName);
-            if (isset($_REQUEST[$colName])&& $_REQUEST[$colName] == 'Y') {
-                $vals .= ",'Y'";
-                $colsNvals .= "," . PMA_Util::backquote($colName) . "='Y'";
-            } else {
-                $vals .= ",'N'";
-                $colsNvals .= "," . PMA_Util::backquote($colName) . "='N'";
-            }
-        }
-    }
-    if ($new) {
-        $sql_query = "INSERT INTO " . $groupTable
-            . "(`usergroup`" . $cols . ")"
-            . " VALUES"
-            . " ('" . PMA_Util::sqlAddSlashes($userGroup) . "'" . $vals . ")";
-    } else {
-        $sql_query = "UPDATE " . $groupTable . " SET " . substr($colsNvals, 1)
-            . " WHERE `usergroup`='" . PMA_Util::sqlAddSlashes($userGroup) . "'";
-    }
-    PMA_queryAsControlUser($sql_query, true);
-}
-
 /**
  * Get HTML snippet for display user properties
  *
@@ -4513,47 +4177,4 @@ function PMA_getSqlQueriesForDisplayAndAddUser($username, $hostname, $password)
         $sql_query
     );
 }
-
-/**
- * Get HTML for secondary level menu tabs on 'Users' page
- *
- * @param string $selfUrl Url of the file
- *
- * @return string HTML for secondary level menu tabs on 'Users' page
- */
-function PMA_getHtmlForSubMenusOnUsersPage($selfUrl)
-{
-    $url_params = PMA_URL_getCommon();
-    $items = array(
-        array(
-            'name' => __('Users overview'),
-            'url' => 'server_privileges.php',
-            'specific_params' => '&viewing_mode=server'
-        ),
-        array(
-            'name' => __('User groups'),
-            'url' => 'server_user_groups.php',
-            'specific_params' => ''
-        )
-    );
-
-    $retval  = '<ul id="topmenu2">';
-    foreach ($items as $item) {
-        $class = '';
-        if ($item['url'] === $selfUrl) {
-            $class = ' class="tabactive"';
-        }
-        $retval .= '<li>';
-        $retval .= '<a' . $class;
-        $retval .= ' href="' . $item['url']
-            . '?' . $url_params . $item['specific_params'] . '">';
-        $retval .= $item['name'];
-        $retval .= '</a>';
-        $retval .= '</li>';
-    }
-    $retval .= '</ul>';
-    $retval .= '<div class="clearfloat"></div>';
-
-    return $retval;
-}
 ?>
diff --git a/libraries/server_user_groups.lib.php b/libraries/server_user_groups.lib.php
new file mode 100644
index 0000000000..7085b60b4a
--- /dev/null
+++ b/libraries/server_user_groups.lib.php
@@ -0,0 +1,355 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * set of functions for user group handling
+ *
+ * @package PhpMyAdmin
+ */
+
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
+/**
+ * Return HTML to list the users belonging to a given user group
+ *
+ * @param string $userGroup user group name
+ *
+ * @return HTML to list the users belonging to a given user group
+ */
+function PMA_getHtmlForListingUsersofAGroup($userGroup)
+{
+    $html_output  = '<h2>'
+        . sprintf(__('Users of \'%s\' user group'), htmlspecialchars($userGroup))
+        . '</h2>';
+
+    $usersTable = PMA_Util::backquote($GLOBALS['cfg']['Server']['pmadb'])
+        . "." . PMA_Util::backquote($GLOBALS['cfg']['Server']['users']);
+    $sql_query = "SELECT `username` FROM " . $usersTable
+        . " WHERE `usergroup`='" . PMA_Util::sqlAddSlashes($userGroup) . "'";
+    $result = PMA_queryAsControlUser($sql_query, false);
+    if ($result) {
+        if ($GLOBALS['dbi']->numRows($result) == 0) {
+            $html_output .= '<p>'
+                . __('No users were found belonging to this user group.')
+                . '</p>';
+        } else {
+            $html_output .= '<table>'
+                . '<thead><tr><th>#</th><th>' . __('User') . '</th></tr></thead>'
+                . '<tbody>';
+            $i = 0;
+            while ($row = $GLOBALS['dbi']->fetchRow($result)) {
+                $i++;
+                $html_output .= '<tr>'
+                    . '<td>' . $i . ' </td>'
+                    . '<td>' . htmlspecialchars($row[0]) . '</td>'
+                    . '</tr>';
+            }
+            $html_output .= '</tbody>'
+                . '</table>';
+        }
+    }
+    $GLOBALS['dbi']->freeResult($result);
+    return $html_output;
+}
+
+/**
+ * Returns HTML for the 'user groups' table
+ *
+ * @return string HTML for the 'user groups' table
+ */
+function PMA_getHtmlForUserGroupsTable()
+{
+    $tabs = PMA_Util::getMenuTabList();
+
+    $html_output  = '<h2>' . __('User groups') . '</h2>';
+    $groupTable = PMA_Util::backquote($GLOBALS['cfg']['Server']['pmadb'])
+        . "." . PMA_Util::backquote($GLOBALS['cfg']['Server']['usergroups']);
+    $sql_query = "SELECT * FROM " . $groupTable . " ORDER BY `usergroup` ASC";
+    $result = PMA_queryAsControlUser($sql_query, false);
+
+    if ($result && $GLOBALS['dbi']->numRows($result)) {
+        $html_output .= '<form name="userGroupsForm" id="userGroupsForm"'
+            . ' action="server_privileges.php" method="post">';
+        $html_output .= PMA_URL_getHiddenInputs();
+        $html_output .= '<table id="userGroupsTable">';
+        $html_output .= '<thead><tr>';
+        $html_output .= '<th style="white-space: nowrap">'
+            . __('User group') . '</th>';
+        $html_output .= '<th>' . __('Server level tabs') . '</th>';
+        $html_output .= '<th>' . __('Database level tabs') . '</th>';
+        $html_output .= '<th>' . __('Table level tabs') . '</th>';
+        $html_output .= '<th>' . __('Action') . '</th>';
+        $html_output .= '</tr></thead>';
+        $html_output .= '<tbody>';
+
+        $odd = true;
+        $userGroups = array();
+        while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
+            $groupName = $row['usergroup'];
+            if (! isset($userGroups[$groupName])) {
+                $userGroups[$groupName] = array();
+            }
+            $userGroups[$groupName][$row['tab']] = $row['allowed'];
+        }
+        foreach ($userGroups as $groupName => $tabs) {
+            $html_output .= '<tr class="' . ($odd ? 'odd' : 'even') . '">';
+            $html_output .= '<td>' . htmlspecialchars($groupName) . '</td>';
+            $html_output .= '<td>' . _getAllowedTabNames($tabs, 'server') . '</td>';
+            $html_output .= '<td>' . _getAllowedTabNames($tabs, 'db') . '</td>';
+            $html_output .= '<td>' . _getAllowedTabNames($tabs, 'table') . '</td>';
+
+            $html_output .= '<td>';
+            $html_output .= '<a class="" href="server_user_groups.php'
+                . PMA_URL_getCommon(
+                    array(
+                        'viewUsers' => 1, 'userGroup' => $groupName
+                    )
+                )
+                . '">'
+                . PMA_Util::getIcon('b_usrlist.png', __('View users')) . '</a>';
+            $html_output .= '&nbsp;&nbsp;';
+            $html_output .= '<a class="" href="server_user_groups.php'
+                . PMA_URL_getCommon(
+                    array(
+                        'editUserGroup' => 1, 'userGroup' => $groupName
+                    )
+                )
+                . '">'
+                . PMA_Util::getIcon('b_edit.png', __('Edit')) . '</a>';
+            $html_output .= '&nbsp;&nbsp;';
+            $html_output .= '<a class="deleteUserGroup ajax"'
+                . ' href="server_user_groups.php'
+                . PMA_URL_getCommon(
+                    array(
+                        'deleteUserGroup' => 1, 'userGroup' => $groupName
+                    )
+                )
+                . '">'
+                . PMA_Util::getIcon('b_drop.png', __('Delete')) . '</a>';
+            $html_output .= '</td>';
+
+            $html_output .= '</tr>';
+
+            $odd = ! $odd;
+        }
+
+        $html_output .= '</tbody>';
+        $html_output .= '</table>';
+        $html_output .= '</form>';
+    }
+    $GLOBALS['dbi']->freeResult($result);
+
+    $html_output .= '<fieldset id="fieldset_add_user_group">';
+    $html_output .= '<a href="server_user_groups.php'
+        . PMA_URL_getCommon(array('addUserGroup' => 1)) . '">'
+        . PMA_Util::getIcon('b_usradd.png')
+        . __('Add user group') . '</a>';
+    $html_output .= '</fieldset>';
+
+    return $html_output;
+}
+
+/**
+ * Returns the list of allowed menu tab names
+ * based on a data row from usergroup table.
+ *
+ * @param array  $row   row of usergroup table
+ * @param string $level 'server', 'db' or 'table'
+ *
+ * @return string comma seperated list of allowed menu tab names
+ */
+function _getAllowedTabNames($row, $level)
+{
+    $tabNames = array();
+    $tabs = PMA_Util::getMenuTabList($level);
+    foreach ($tabs as $tab => $tabName) {
+        if (! isset($row[$level . '_' . $tab])
+            || $row[$level . '_' . $tab] == 'Y'
+        ) {
+            $tabNames[] = $tabName;
+        }
+    }
+    return implode(', ', $tabNames);
+}
+
+/**
+ * Deletes a user group
+ *
+ * @param string $userGroup user group name
+ *
+ * @return void
+ */
+function PMA_deleteUserGroup($userGroup)
+{
+    $userTable = PMA_Util::backquote($GLOBALS['cfg']['Server']['pmadb'])
+        . "." . PMA_Util::backquote($GLOBALS['cfg']['Server']['users']);
+    $groupTable = PMA_Util::backquote($GLOBALS['cfg']['Server']['pmadb'])
+        . "." . PMA_Util::backquote($GLOBALS['cfg']['Server']['usergroups']);
+    $sql_query = "DELETE FROM " . $userTable
+        . " WHERE `usergroup`='" . PMA_Util::sqlAddSlashes($userGroup) . "'";
+    PMA_queryAsControlUser($sql_query, true);
+    $sql_query = "DELETE FROM " . $groupTable
+        . " WHERE `usergroup`='" . PMA_Util::sqlAddSlashes($userGroup) . "'";
+    PMA_queryAsControlUser($sql_query, true);
+}
+
+/**
+ * Returns HTML for add/edit user group dialog
+ *
+ * @param string $userGroup name of the user group in case of editing
+ *
+ * @return string HTML for add/edit user group dialog
+ */
+function PMA_getHtmlToEditUserGroup($userGroup = null)
+{
+    $html_output = '';
+    if ($userGroup == null) {
+        $html_output .= '<h2>' . __('Add user group') . '</h2>';
+    } else {
+        $html_output .= '<h2>'
+            . sprintf(__('Edit user group: \'%s\''), htmlspecialchars($userGroup))
+            . '</h2>';
+    }
+
+    $html_output .= '<form name="userGroupForm" id="userGroupForm"'
+        . ' action="server_user_groups.php" method="post">';
+    $urlParams = array();
+    if ($userGroup != null) {
+        $urlParams['userGroup'] = $userGroup;
+        $urlParams['editUserGroupSubmit'] = '1';
+    } else {
+        $urlParams['addUserGroupSubmit'] = '1';
+    }
+    $html_output .= PMA_URL_getHiddenInputs($urlParams);
+
+    $html_output .= '<fieldset id="fieldset_user_group_rights">';
+    $html_output .= '<legend>' . __('User group menu assignments')
+        . '&nbsp;&nbsp;&nbsp;'
+        . '<input type="checkbox" class="checkall_box" title="Check All">'
+        . '<label for="addUsersForm_checkall">' . __('Check All') .'</label>'
+        . '</legend>';
+
+    if ($userGroup == null) {
+        $html_output .= '<label for="userGroup">' . __('Group name:') . '</label>';
+        $html_output .= '<input type="text" name="userGroup" '
+            . 'autocomplete="off" required="required" />';
+        $html_output .= '<div class="clearfloat"></div>';
+    }
+
+    $allowedTabs = array(
+        'server' => array(),
+        'db'     => array(),
+        'table'	 => array()
+    );
+    if ($userGroup != null) {
+        $groupTable = PMA_Util::backquote($GLOBALS['cfg']['Server']['pmadb'])
+            . "." . PMA_Util::backquote($GLOBALS['cfg']['Server']['usergroups']);
+        $sql_query = "SELECT * FROM " . $groupTable
+            . " WHERE `usergroup`='" . PMA_Util::sqlAddSlashes($userGroup) . "'";
+        $result = PMA_queryAsControlUser($sql_query, false);
+        if ($result) {
+            while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
+                $key = $row['tab'];
+                $value = $row['allowed'];
+                if (substr($key, 0, 7) == 'server_' && $value == 'Y') {
+                    $allowedTabs['server'][] = substr($key, 7);
+                } elseif (substr($key, 0, 3) == 'db_' && $value == 'Y') {
+                    $allowedTabs['db'][] = substr($key, 3);
+                } elseif (substr($key, 0, 6) == 'table_' && $value == 'Y') {
+                    $allowedTabs['table'][] = substr($key, 6);
+                }
+            }
+        }
+        $GLOBALS['dbi']->freeResult($result);
+    }
+
+    $html_output .= _getTabList(
+        __('Server-level tabs'), 'server', $allowedTabs['server']
+    );
+    $html_output .= _getTabList(
+        __('Database-level tabs'), 'db', $allowedTabs['db']
+    );
+    $html_output .= _getTabList(
+        __('Table-level tabs'), 'table', $allowedTabs['table']
+    );
+
+    $html_output .= '</fieldset>';
+
+    $html_output .= '<fieldset id="fieldset_user_group_rights_footer"'
+        . ' class="tblFooters">';
+    $html_output .= '<input type="submit" name="update_privs" value="Go">';
+    $html_output .= '</fieldset>';
+
+    return $html_output;
+}
+
+/**
+ * Returns HTML for checkbox groups to choose
+ * tabs of 'server', 'db' or 'table' levels.
+ *
+ * @param string $title    title of the checkbox group
+ * @param string $level    'server', 'db' or 'table'
+ * @param array  $selected array of selected allowed tabs
+ *
+ * @return string HTML for checkbox groups
+ */
+function _getTabList($title, $level, $selected)
+{
+    $tabs = PMA_Util::getMenuTabList($level);
+    $html_output = '<fieldset>';
+    $html_output .= '<legend>' . $title . '</legend>';
+    foreach ($tabs as $tab => $tabName) {
+        $html_output .= '<div class="item">';
+        $html_output .= '<input type="checkbox" class="checkall"'
+            . (in_array($tab, $selected) ? ' checked="checked"' : '')
+            . ' name="' . $level . '_' . $tab .  '" value="Y" />';
+        $html_output .= '<label for="' . $level . '_' . $tab .  '">'
+            . '<code>' . $tabName . '</code>'
+            . '</label>';
+        $html_output .= '</div>';
+    }
+    $html_output .= '</fieldset>';
+    return $html_output;
+}
+
+/**
+ * Add/update a user group with allowed menu tabs.
+ *
+ * @param string  $userGroup user group name
+ * @param boolean $new       whether this is a new user group
+ *
+ * @return void
+ */
+function PMA_editUserGroup($userGroup, $new = false)
+{
+    $tabs = PMA_Util::getMenuTabList();
+    $groupTable = PMA_Util::backquote($GLOBALS['cfg']['Server']['pmadb'])
+        . "." . PMA_Util::backquote($GLOBALS['cfg']['Server']['usergroups']);
+
+    if (! $new) {
+        $sql_query = "DELETE FROM " . $groupTable
+            . " WHERE `usergroup`='" . PMA_Util::sqlAddSlashes($userGroup) . "';";
+        PMA_queryAsControlUser($sql_query, true);
+    }
+
+    $sql_query = "INSERT INTO " . $groupTable
+        . "(`usergroup`, `tab`, `allowed`)"
+        . " VALUES ";
+    $first = true;
+    foreach ($tabs as $tabGroupName => $tabGroup) {
+        foreach ($tabs[$tabGroupName] as $tab => $tabName) {
+            if (! $first) {
+                $sql_query .= ", ";
+            }
+            $tabName = $tabGroupName . '_' . $tab;
+            $allowed = isset($_REQUEST[$tabName]) && $_REQUEST[$tabName] == 'Y';
+            $sql_query .= "('" . $userGroup . "', '" . $tabName . "', '"
+                . ($allowed ? "Y" : "N") . "')";
+            $first = false;
+        }
+    }
+    $sql_query .= ";";
+    PMA_queryAsControlUser($sql_query, true);
+}
+?>
\ No newline at end of file
diff --git a/libraries/server_users.lib.php b/libraries/server_users.lib.php
new file mode 100644
index 0000000000..57d59b7657
--- /dev/null
+++ b/libraries/server_users.lib.php
@@ -0,0 +1,55 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * set of common functions for sub tabs in server level `Users` page
+ *
+ * @package PhpMyAdmin
+ */
+
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
+/**
+ * Get HTML for secondary level menu tabs on 'Users' page
+ *
+ * @param string $selfUrl Url of the file
+ *
+ * @return string HTML for secondary level menu tabs on 'Users' page
+ */
+function PMA_getHtmlForSubMenusOnUsersPage($selfUrl)
+{
+    $url_params = PMA_URL_getCommon();
+    $items = array(
+        array(
+            'name' => __('Users overview'),
+            'url' => 'server_privileges.php',
+            'specific_params' => '&viewing_mode=server'
+        ),
+        array(
+            'name' => __('User groups'),
+            'url' => 'server_user_groups.php',
+            'specific_params' => ''
+        )
+    );
+
+    $retval  = '<ul id="topmenu2">';
+    foreach ($items as $item) {
+        $class = '';
+        if ($item['url'] === $selfUrl) {
+            $class = ' class="tabactive"';
+        }
+        $retval .= '<li>';
+        $retval .= '<a' . $class;
+        $retval .= ' href="' . $item['url']
+            . '?' . $url_params . $item['specific_params'] . '">';
+        $retval .= $item['name'];
+        $retval .= '</a>';
+        $retval .= '</li>';
+    }
+    $retval .= '</ul>';
+    $retval .= '<div class="clearfloat"></div>';
+
+    return $retval;
+}
+?>
\ No newline at end of file
diff --git a/server_privileges.php b/server_privileges.php
index 410f82b03e..4500f439b2 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -30,6 +30,7 @@ $scripts->addFile('server_privileges.js');
 if ((isset($_REQUEST['viewing_mode']) && $_REQUEST['viewing_mode'] == 'server')
     && $GLOBALS['cfgRelation']['menuswork']
 ) {
+    include_once 'libraries/server_users.lib.php';
     $response->addHTML('<div>');
     $response->addHTML(PMA_getHtmlForSubMenusOnUsersPage('server_privileges.php'));
 }
diff --git a/server_user_groups.php b/server_user_groups.php
index 65900a87ef..7236a91615 100644
--- a/server_user_groups.php
+++ b/server_user_groups.php
@@ -7,7 +7,8 @@
  */
 
 require_once 'libraries/common.inc.php';
-require_once 'libraries/server_privileges.lib.php';
+require_once 'libraries/server_users.lib.php';
+require_once 'libraries/server_user_groups.lib.php';
 
 PMA_getRelationsParam();
 if (! $GLOBALS['cfgRelation']['menuswork']) {
diff --git a/test/libraries/PMA_server_privileges_test.php b/test/libraries/PMA_server_privileges_test.php
index ffc6a5ee78..dd41e1bac9 100644
--- a/test/libraries/PMA_server_privileges_test.php
+++ b/test/libraries/PMA_server_privileges_test.php
@@ -739,42 +739,6 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
         );
     }
 
-    /**
-     * Test for PMA_getHtmlForSubMenusOnUsersPage
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForSubMenusOnUsersPage()
-    {
-        $html = PMA_getHtmlForSubMenusOnUsersPage('server_privileges.php');
-
-        //validate 1: topmenu2
-        $this->assertContains(
-            '<ul id="topmenu2">',
-            $html
-        );
-
-        //validate 2: tabactive for server_privileges.php
-        $this->assertContains(
-            '<a class="tabactive" href="server_privileges.php',
-            $html
-        );
-        $this->assertContains(
-            __('Users overview'),
-            $html
-        );
-
-        //validate 3: not-active for server_user_groups.php
-        $this->assertContains(
-            '<a href="server_user_groups.php',
-            $html
-        );
-        $this->assertContains(
-            __('User groups'),
-            $html
-        );
-    }
-
     /**
      * Test for PMA_getSqlQueriesForDisplayAndAddUser
      *
diff --git a/test/libraries/PMA_server_user_groups_test.php b/test/libraries/PMA_server_user_groups_test.php
index c15bf08034..aac165c3e4 100644
--- a/test/libraries/PMA_server_user_groups_test.php
+++ b/test/libraries/PMA_server_user_groups_test.php
@@ -12,7 +12,7 @@ require_once 'libraries/relation.lib.php';
 /*
  * Include to test.
  */
-require_once 'libraries/server_privileges.lib.php';
+require_once 'libraries/server_user_groups.lib.php';
 
 /**
  * Tests for server_user_groups.lib.php
@@ -99,12 +99,8 @@ class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase
                 $this->returnValue(
                     array(
                         'usergroup' => 'usergroup',
-                        'server_sql' => 'Y',
-                        'server_databases' => 'N',
-                        'db_sql' => 'Y',
-                        'db_structure' => 'N',
-                        'table_sql' => 'Y',
-                        'table_browse' => 'N'
+                        'tab' => 'server_sql',
+                        'allowed' => 'Y'
                     )
                 )
             );
@@ -122,33 +118,33 @@ class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase
             $html
         );
         $url_tag = '<a class="" href="server_user_groups.php'
-                . PMA_URL_getCommon(
-                    array(
-                        'viewUsers'=>1, 'userGroup'=>htmlspecialchars('usergroup')
-                    )
-                );
+            . PMA_URL_getCommon(
+                array(
+                    'viewUsers'=>1, 'userGroup'=>htmlspecialchars('usergroup')
+                )
+            );
         $this->assertContains(
             $url_tag,
             $html
         );
         $url_tag = '<a class="" href="server_user_groups.php'
-                . PMA_URL_getCommon(
-                    array(
-                        'editUserGroup'=>1, 
-                        'userGroup'=>htmlspecialchars('usergroup')
-                    )
-                );
+            . PMA_URL_getCommon(
+                array(
+                    'editUserGroup'=>1,
+                    'userGroup'=>htmlspecialchars('usergroup')
+                )
+            );
         $this->assertContains(
             $url_tag,
             $html
         );
         $url_tag = '<a class="deleteUserGroup ajax" href="server_user_groups.php'
-                . PMA_URL_getCommon(
-                    array(
-                        'deleteUserGroup'=> 1, 
-                        'userGroup'=>htmlspecialchars('usergroup')
-                    )
-                );
+            . PMA_URL_getCommon(
+                array(
+                    'deleteUserGroup'=> 1,
+                    'userGroup'=>htmlspecialchars('usergroup')
+                )
+            );
         $this->assertContains(
             $url_tag,
             $html
@@ -208,22 +204,22 @@ class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase
             ->method('tryQuery')
             ->with($expectedQuery)
             ->will($this->returnValue(true));
-        $dbi->expects($this->once())
+        $dbi->expects($this->at(1))
             ->method('fetchAssoc')
             ->withAnyParameters()
             ->will(
                 $this->returnValue(
                     array(
                         'usergroup' => 'ug',
-                        'server_sql' => 'Y',
-                        'server_databases' => 'N',
-                        'db_sql' => 'Y',
-                        'db_structure' => 'N',
-                        'table_sql' => 'Y',
-                        'table_browse' => 'N'
+                        'tab' => 'server_sql',
+                        'allowed' => 'Y'
                     )
                 )
             );
+        $dbi->expects($this->at(2))
+            ->method('fetchAssoc')
+            ->withAnyParameters()
+            ->will($this->returnValue(false));
         $dbi->expects($this->once())
             ->method('freeResult');
         $GLOBALS['dbi'] = $dbi;
diff --git a/test/libraries/PMA_server_users_test.php b/test/libraries/PMA_server_users_test.php
new file mode 100644
index 0000000000..2d9de4fee9
--- /dev/null
+++ b/test/libraries/PMA_server_users_test.php
@@ -0,0 +1,62 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Tests for server_users.lib.php
+ *
+ * @package PhpMyAdmin-test
+ */
+
+require_once 'libraries/php-gettext/gettext.inc';
+require_once 'libraries/url_generating.lib.php';
+
+/*
+ * Include to test.
+ */
+require_once 'libraries/server_users.lib.php';
+
+/**
+ * PMA_ServerUsers_Test class
+ *
+ * This class is for testing server_users.lib.php functions
+ *
+ * @package PhpMyAdmin-test
+ */
+class PMA_ServerUsers_Test extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Test for PMA_getHtmlForSubMenusOnUsersPage
+     *
+     * @return void
+     */
+    public function testPMAGetHtmlForSubMenusOnUsersPage()
+    {
+        $html = PMA_getHtmlForSubMenusOnUsersPage('server_privileges.php');
+
+        //validate 1: topmenu2
+        $this->assertContains(
+            '<ul id="topmenu2">',
+            $html
+        );
+
+        //validate 2: tabactive for server_privileges.php
+        $this->assertContains(
+            '<a class="tabactive" href="server_privileges.php',
+            $html
+        );
+        $this->assertContains(
+            __('Users overview'),
+            $html
+        );
+
+        //validate 3: not-active for server_user_groups.php
+        $this->assertContains(
+            '<a href="server_user_groups.php',
+            $html
+        );
+        $this->assertContains(
+            __('User groups'),
+            $html
+        );
+    }
+}
+?>
\ No newline at end of file