diff --git a/ChangeLog b/ChangeLog
index f7026632e..593b3b9b9 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ $Source$
 
 2004-04-28 Michal Cihar  <michal@cihar.com>
     * css/phpmyadmin.css.php: Force <button> to be displayed inline.
+    * libraries/common.lib.php: When only_db matches no database, do not show
+      any (bug #943626).
 
 2004-04-28 Garvin Hicking <pma@supergarv.de>
     * left.php, libraries/left.js: Fixed unneeded spacing between items
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index bce11d0b6..c04d926f0 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1117,11 +1117,13 @@ if ($is_minimum_common == FALSE) {
      *
      * @global  array    the list of available databases
      * @global  integer  the number of available databases
+     * @global  array    current configuration
      */
     function PMA_availableDatabases($error_url = '')
     {
         global $dblist;
         global $num_dbs;
+        global $cfg;
 
         $num_dbs = count($dblist);
 
@@ -1140,10 +1142,9 @@ if ($is_minimum_common == FALSE) {
             unset($true_dblist);
             $num_dbs     = count($dblist);
         } // end if
-
         // 2. Allowed database list is empty -> gets the list of all databases
         //    on the server
-        else {
+        else if (!isset($cfg['Server']['only_db']) || $cfg['Server']['only_db'] == '') {
             $dblist = PMA_DBI_get_dblist(); // needed? or PMA_mysqlDie('', 'SHOW DATABASES;', FALSE, $error_url);
             $num_dbs = count($dblist);
         } // end else