diff --git a/ChangeLog b/ChangeLog
index 0b8e8d62d9a1..1aeace4e16c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,7 @@ phpMyAdmin - ChangeLog
 - bug #3512916 [display] Right frame reloads after displaying SQL result(zero rows)
 - bug [interface] Fixed missing Codemirror for inline query edit when exporting a result set
 - bug #3514490 [auth] Multiple Navigation panels bug still present
+- bug #3515181 [users] Error in create user + underscore + create database
 
 3.5.0.0 (not yet released)
 + rfe #2021981 [interface] Add support for mass prefix change.
diff --git a/server_privileges.php b/server_privileges.php
index afecb00b61f0..53c4ed396fe4 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1156,7 +1156,7 @@ function PMA_getGrants($user, $host)
                 }
 
                 $q = 'GRANT ALL PRIVILEGES ON '
-                    . PMA_backquote(PMA_sqlAddSlashes($username)) . '.* TO \''
+                    . PMA_backquote(PMA_escape_mysql_wildcards(PMA_sqlAddSlashes($username))) . '.* TO \''
                     . PMA_sqlAddSlashes($username) . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\';';
                 $sql_query .= $q;
                 if (! PMA_DBI_try_query($q)) {