diff --git a/ChangeLog b/ChangeLog
index c0cb53c03..0eff45684 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,12 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2006-01-16 Marc Delisle  <lem9@users.sourceforge.net>
+    * server_privileges.php: typo
+    * libraries/check_user_privileges.lib.php: bug #1406499,
+      a username containing an hyphen could not create a db under
+      MySQL 4.0.x, thanks to "timeout-"
+
 2006-01-14 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * libraries/sql_query_form.lib.php: undefined js variable
     * libraries/database_interface.lib.php: PMA_DBI_get_tables_full() first parameter
diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php
index b302b92a4..89c9a8906 100644
--- a/libraries/check_user_privileges.lib.php
+++ b/libraries/check_user_privileges.lib.php
@@ -158,7 +158,7 @@ if (PMA_MYSQL_INT_VERSION >= 40102) {
             if (!$rs_usr) {
                 // OK, now we'd have to guess the user's hostname, but we
                 // only try out the 'username'@'%' case.
-                $rs_usr      = PMA_DBI_try_query('SHOW GRANTS FOR ' . $mysql_cur_user . ';', $controllink, PMA_DBI_QUERY_STORE);
+                $rs_usr      = PMA_DBI_try_query('SHOW GRANTS FOR ' . PMA_convert_using(PMA_sqlAddslashes($mysql_cur_user), 'quoted') . ';', $controllink, PMA_DBI_QUERY_STORE);
             }
             unset($local_query);
             if ($rs_usr) {