diff --git a/ChangeLog b/ChangeLog
index afb7ade2e..01e598dc0 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,7 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
-2001-09-25  Loïc Chapeaux  <lolo@phpheaven.net>
+2001-09-26  Loïc Chapeaux  <lolo@phpheaven.net>
 	* libraries/common.lib.php3; left.php3; tbl_move_copy.php3;
 	  tbl_properties.php3; tbl_rename.php3: fixed some security issues.
 
diff --git a/tbl_move_copy.php3 b/tbl_move_copy.php3
index e87eb7eb5..7eea811e3 100644
--- a/tbl_move_copy.php3
+++ b/tbl_move_copy.php3
@@ -64,9 +64,8 @@ if (isset($new_name) && trim($new_name) != '') {
     }
 
     // Ensure the target is valid
-    // The functions used below are defined in "common.lib.php3"
-    available_databases('main.php3?lang=' . $lang . '&server=' . $server);
-    if (pmaIsInto($db, $dblist) == -1 || pmaIsInto($target_db, $dblist) == -1) {
+    if (count($dblist) > 0 &&
+        (pmaIsInto($db, $dblist) == -1 || pmaIsInto($target_db, $dblist) == -1)) {
         exit();
     }
     if (MYSQL_INT_VERSION < 32306) {
diff --git a/tbl_rename.php3 b/tbl_rename.php3
index 96c75dfdd..21ff25b35 100755
--- a/tbl_rename.php3
+++ b/tbl_rename.php3
@@ -31,9 +31,7 @@ if (isset($new_name) && trim($new_name) != '') {
     }
 
     // Ensure the target is valid
-    // The functions used below are defined in "common.lib.php3"
-    available_databases('main.php3?lang=' . $lang . '&server=' . $server);
-    if (pmaIsInto($db, $dblist) == -1) {
+    if (count($dblist) > 0 && pmaIsInto($db, $dblist) == -1) {
         exit();
     }
     if (MYSQL_INT_VERSION < 32306) {