diff --git a/ChangeLog b/ChangeLog
index cf1396cd9..4687abf51 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ $Source$
     * db_details_links.php3, index.php3, left.php3, tbl_properties_links.php3:
       moved 'Structure' to the front and use it as default value. 
       TODO: make that customizable. 
+    * config.inc.php3, main.php3, docs: added cfg['SuggestDBName'] flag 
 
 2002-06-22 Robin Johnson  <robbat2@users.sourceforge.net>
     * sql.php3:
diff --git a/Documentation.html b/Documentation.html
index 7a63ff721..2a73ba7ad 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -964,6 +964,13 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
         <br /><br />
     </dd>
 
+    <dt><b>$cfg['SuggestDBName']</b> boolean</dt>
+    <dd>
+        Defines whether to suggest a database name on the "Create Database" 
+        form or to keep the textfield empty.
+        <br /><br />
+    </dd>
+
     <dt><b>$cfg['LoginCookieRecall'] </b>boolean</dt>
     <dd>
         Define whether the previous login should be recalled or not in cookie
diff --git a/config.inc.php3 b/config.inc.php3
index 4f24edc46..cac05e7d9 100755
--- a/config.inc.php3
+++ b/config.inc.php3
@@ -157,6 +157,7 @@ $cfg['ShowMysqlInfo']         = FALSE;  // whether to display the "MySQL runtime
 $cfg['ShowMysqlVars']         = FALSE;  // information", "MySQL system variables", "PHP
 $cfg['ShowPhpInfo']           = FALSE;  // information" and "change password" links for
 $cfg['ShowChgPassword']       = FALSE;  // simple users or not
+$cfg['SuggestDBName']         = TRUE;   // suggest a new DB name if possible (false = keep empty)
 
 // In browse mode...
 $cfg['ShowBlob']              = FALSE;  // display blob field contents
diff --git a/main.php3 b/main.php3
index d50e13c98..4b1ee0cc4 100755
--- a/main.php3
+++ b/main.php3
@@ -247,6 +247,10 @@ if ($server > 0) {
         $db_to_create = '';
     } // end else
 
+    if (!$cfg['SuggestDBName']) {
+        $db_to_create = '';
+    }
+
     $common_url_query = 'lang=' . $lang . '&amp;server=' . $server . '&amp;convcharset=' . $convcharset;
 
     if ($is_superuser) {