diff --git a/ChangeLog b/ChangeLog
index 7858655aaf..559dd8ff31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -60,6 +60,7 @@ VerboseMultiSubmit, ReplaceHelpImg
 - bug #3546277 [core] Call to undefined function __() when config file has wrong permissions
 - bug #3540922 [edit] Error searching table with many fields
 - bug #3555104 [edit] Cannot copy a DB with table & views
+- bug #3559925 [privileges] Incorrect updating of the list of users
 
 3.5.2.2 (2012-08-12)
 - [security] Fixed XSS vulnerabilities, see PMASA-2012-4
diff --git a/js/server_privileges.js b/js/server_privileges.js
index 363c938bb0..f1dd2f4754 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -412,6 +412,9 @@ $(function() {
                 if (data.db_specific_privs == false || (db_priv_page == data.db_specific_privs)) {
                     reload_privs = true;
                 }
+                if (data.db_wildcard_privs) {
+                    reload_privs = false;
+                }
 
                 //Change privileges, if they were edited and need to be reloaded
                 if(data.new_privileges && reload_privs) {
diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index e46f03a4db..72c89a560e 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1911,8 +1911,10 @@ function PMA_getExtraDataForAjaxBehavior($password, $link_export, $sql_query,
 
     if (isset($_POST['update_privs'])) {
         $extra_data['db_specific_privs'] = false;
+        $extra_data['db_wildcard_privs'] = false;
         if (isset($dbname_is_wildcard)) {
             $extra_data['db_specific_privs'] = ! $dbname_is_wildcard;
+            $extra_data['db_wildcard_privs'] = $dbname_is_wildcard;
         }
         $new_privileges = join(', ', PMA_extractPrivInfo('', true));