diff --git a/ChangeLog b/ChangeLog
index 546551ade..26324d895 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ $Source$
       script.
     * pdf_schema.php: Do not use right_font_family.
     * lang/czech: Update.
+    * libraries/auth/cookie.auth.lib.php: Fix undefined indexes.
 
 2005-11-24 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * libraries/grab_globals.lib.php: allow scripts to bypass importing vars
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index 45a251833..d97a40ce3 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -464,14 +464,14 @@ function PMA_auth_set_user()
 
         // any parameters to pass?
         $url_params = array();
-        if ( ! empty($GLOBALS['target']) ) {
+        if ( ! empty($GLOBALS['db']) ) {
             $url_params['db'] = $GLOBALS['db'];
         }
-        if ( ! empty($GLOBALS['target']) ) {
+        if ( ! empty($GLOBALS['table']) ) {
             $url_params['table'] = $GLOBALS['table'];
         }
         // any target to pass?
-        if ( ! empty($GLOBALS['target']) ) {
+        if ( ! empty($GLOBALS['target']) && $GLOBALS['target'] != 'index.php' ) {
             $url_params['target'] = $GLOBALS['target'];
         }