diff --git a/ChangeLog b/ChangeLog
index 3fe7e6277..887ea19ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@ $HeadURL$
 2007-01-20 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/sqlparser.lib.php: bug #1638267, wrong reserved word
       recognition
+    * server_privileges.php: bug #1635377, superfluous backslash,
+      thanks to Hanut
 
 2007-01-19 Marc Delisle  <lem9@users.sourceforge.net>
     * pmd*, lang/*: Designer now supports set/unset of the display field,
diff --git a/server_privileges.php b/server_privileges.php
index ae8a302e9..a4300809e 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1582,10 +1582,12 @@ if ( empty( $adduser ) && ( ! isset( $checkprivs ) || ! strlen($checkprivs) ) )
             } else {
             echo '    - ' . $GLOBALS['strDatabase'];
             }
-            echo ' <i><a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . $GLOBALS['url_query'] . '&amp;db=' . urlencode($dbname) . '&amp;reload=1">' . htmlspecialchars($dbname) . '</a></i>' . "\n";
+            $url_dbname = urlencode(str_replace('\_', '_', $dbname));
+            echo ' <i><a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . $GLOBALS['url_query'] . '&amp;db=' . $url_dbname . '&amp;reload=1">' . htmlspecialchars($dbname) . '</a></i>' . "\n";
             if ( isset( $tablename ) && strlen($tablename) ) {
-                echo '    - ' . $GLOBALS['strTable'] . ' <i><a href="' . $GLOBALS['cfg']['DefaultTabTable'] . '?' . $GLOBALS['url_query'] . '&amp;db=' . urlencode($dbname) . '&amp;table=' . urlencode($tablename) . '&amp;reload=1">' . htmlspecialchars($tablename) . '</a></i>' . "\n";
+                echo '    - ' . $GLOBALS['strTable'] . ' <i><a href="' . $GLOBALS['cfg']['DefaultTabTable'] . '?' . $GLOBALS['url_query'] . '&amp;db=' . $url_dbname . '&amp;table=' . urlencode($tablename) . '&amp;reload=1">' . htmlspecialchars($tablename) . '</a></i>' . "\n";
             }
+            unset($url_dbname);
         }
         echo ' : ' . $GLOBALS['strEditPrivileges'] . '</h2>' . "\n";
         $res = PMA_DBI_query('SELECT \'foo\' FROM `mysql`.`user` WHERE ' . PMA_convert_using('User') . ' = ' . PMA_convert_using(PMA_sqlAddslashes($username), 'quoted') . ' AND ' . PMA_convert_using('Host') . ' = ' . PMA_convert_using($hostname, 'quoted') . ';', null, PMA_DBI_QUERY_STORE);