diff --git a/ChangeLog b/ChangeLog
index 850be6236..2e08c759b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-11-15 Alexander M. Turek  <rabus@users.sourceforge.net>
+    * scripts/create_tables.sql: Added a 'USE' command after 'CREATE DATABASE'.
+
 2002-11-14 Marc Delisle  <lem9@users.sourceforge.net>
     * sql.php3: stripslashes issues (with LOAD DATA)
     * libraries/display_tbl.lib.php3: could not Edit or Delete when only
diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql
index c680b1f66..b997fabc3 100644
--- a/scripts/create_tables.sql
+++ b/scripts/create_tables.sql
@@ -13,9 +13,11 @@
 #                                                       #
 #########################################################
 
-CREATE DATABASE phpmyadmin;
+CREATE DATABASE `phpmyadmin`;
 
-GRANT     SELECT,INSERT,DELETE     ON    phpmyadmin.*    to
+USE `phpmyadmin`;
+
+GRANT SELECT, INSERT, DELETE ON `phpmyadmin`.* TO
     'pma'@localhost;
 
 CREATE TABLE `PMA_bookmark` (
@@ -70,4 +72,4 @@ CREATE TABLE `PMA_column_comments` (
     comment varchar(255) NOT NULL default '',
     PRIMARY KEY (id),
     UNIQUE KEY db_name (db_name, table_name, column_name)
-    ) TYPE=MyISAM COMMENT='Comments for Columns';
\ No newline at end of file
+    ) TYPE=MyISAM COMMENT='Comments for Columns';