diff --git a/ChangeLog b/ChangeLog
index ccd348beb..82645e4db 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@ $Source$
     * scripts/upgrade.pl: new script to let unix admins upgrade phpMyadmin
       with one command and 5 seconds. To be improved, but is working fine
       here (tm).  Based on: http://www.phpmyadmin.net/latest.txt 
+    * server_privileges.php: always display the "Add a new user" link 
+      on the User overview page (no more need to click on [show all] or
+      an initial before)
 
 2005-05-05 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/mysql_charsets.lib.php: bug #1186983, missing character
diff --git a/server_privileges.php b/server_privileges.php
index d8b69d1bc..03f92ebb5 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1136,8 +1136,25 @@ if (empty($adduser) && empty($checkprivs)) {
                    . '<div class="tblWarn">' . "\n"
                    . '    ' . sprintf($strFlushPrivilegesNote, '<a href="server_privileges.php?' . $url_query . '&amp;flush_privileges=1">', '</a>') . "\n"
                    . '</div>' . "\n";
+                } else {
+
+                unset ($row);
+                echo '    <br /><table border="0" cellpading="3" cellspacing="0">' . "\n"
+                   . '        <tr bgcolor="' . $cfg['BgcolorOne'] . '"><td '
+                   . ($cfg['PropertiesIconic'] ? 'colspan="3"><b><a href="server_privileges.php?' . $url_query . '&amp;adduser=1"><img src="' . $pmaThemeImage . 'b_usradd.png" width="16" height="16" hspace="2" border="0" align="middle" />' : 'width="20" nowrap="nowrap" align="center" valign="top"><b>&#8226;</b></td><td><b><a href="server_privileges.php?' . $url_query . '&amp;adduser=1">' ). "\n"
+                   . '            ' . $strAddUser . '</a></b>' . "\n"
+                   . '            ' . "\n"
+                   . '        </td></tr>' . "\n" . '        <tr><td colspan="2"></td></tr>'
+                   . '    </table>' . "\n"
+                   . '</form>' . "\n"
+                   . '<div class="tblWarn">' . "\n"
+                   . '    ' . sprintf($strFlushPrivilegesNote, '<a href="server_privileges.php?' . $url_query . '&amp;flush_privileges=1">', '</a>') . "\n"
+                   . '</div>' . "\n";
                 } // end if (display overview)
-        }
+
+         }
+
+
     } else {
 
         // A user was selected -> display the user's properties