diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 90e2aff84e..b9c95e70ba 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1825,6 +1825,7 @@ function PMA_getExtraDataForAjaxBehavior($password, $link_export, $sql_query,
         }
     }
 
+    $extra_data = array();
     if (strlen($sql_query)) {
         $extra_data['sql_query']
             = PMA_Util::getMessage(null, $sql_query);
@@ -2987,9 +2988,6 @@ function PMA_getHtmlForDisplayUserOverviewPage($link_edit, $pmaThemeImage,
             $flushnote->addParam('</a>', false);
             $html_output .= $flushnote->getDisplay();
         }
-        if ($GLOBALS['is_ajax_request']) {
-            exit;
-        }
         return $html_output;
     }
 }
diff --git a/server_privileges.php b/server_privileges.php
index 9f1f409d58..f89e45c59d 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -378,6 +378,7 @@ list($link_edit, $link_revoke, $link_export)
  * Flush Privileges, show $message and exit.
  */
 if ($GLOBALS['is_ajax_request']
+    && empty($_REQUEST['ajax_page_request'])
     && ! isset($_REQUEST['export'])
     && (! isset($_REQUEST['submit_mult']) || $_REQUEST['submit_mult'] != 'export')
     && (! isset($_REQUEST['adduser']) || $_add_user_error)