diff --git a/ChangeLog b/ChangeLog
index baa26d81a..cabe8f354 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-08-10 Alexander M. Turek  <rabus@users.sourceforge.net>
+    * sql.php3: Default pages for tables / databases.
+
 2002-08-10 Loïc Chapeaux  <lolo@phpheaven.net>
     * config.inc.php3: coding standards.
     * db_details.php3; db_details_qbe.php3; tbl_change.php3;
@@ -14,7 +17,7 @@ $Source$
 
 2002-08-09 Marc Delisle  <lem9@users.sourceforge.net>
     * user_details.php3: bug 591602, mysql.user lowercase "password",
-      thanks to Thomas Bähr <baehr at glaswald.de> 
+      thanks to Thomas Bähr <baehr at glaswald.de>
     * lang/romanian: update, thanks to Valics Lehel
 
 2002-08-09 Robin Johnson  <robbat2@users.sourceforge.net>
@@ -41,7 +44,6 @@ $Source$
     * config.inc.php3:
         - Cleaned up and re-arranged Configuration section to match
           config.inc.php3
-    
 
 2002-08-08 Loïc Chapeaux  <lolo@phpheaven.net>
     * left.php3: xhtml fixes (id name must start with a letter).
diff --git a/sql.php3 b/sql.php3
index a9dca1fee..cfe8d02ef 100755
--- a/sql.php3
+++ b/sql.php3
@@ -23,7 +23,7 @@ if (!empty($goto)) {
 } // end if (security checkings)
 
 if (empty($goto)) {
-    $goto         = (empty($table)) ? 'db_details.php3' : 'tbl_properties.php3';
+    $goto         = (empty($table)) ? $cfg['DefaultTabDatabase'] : $cfg['DefaultTabTable'];
     $is_gotofile  = TRUE;
 } // end if
 if (!isset($err_url)) {
@@ -204,7 +204,7 @@ if (!$cfg['Confirm']
     || !empty($GLOBALS['validatequery'])) {
     $do_confirm = FALSE;
 } else {
-     /* SQL-Parser-Analyzer */ 
+     /* SQL-Parser-Analyzer */
     $do_confirm = (eregi('DROP[[:space:]]+(IF[[:space:]]+EXISTS[[:space:]]+)?(TABLE|DATABASE[[:space:]])|ALTER[[:space:]]+TABLE[[:space:]]+((`[^`]+`)|([A-Za-z0-9_$]+))[[:space:]]+DROP[[:space:]]|DELETE[[:space:]]+FROM[[:space:]]', $sql_query));
 }