diff --git a/ChangeLog b/ChangeLog
index 8e2c47242..6b3160828 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ $Source$
 
 2006-11-29 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/spanish update, thanks to Daniel Hinostroza
+    * sql.php, libraries/display_tbl.lib.php: patch #1605032, checks for
+     undefined index, thanks to Arpad Borsos
 
 2006-11-26 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_properties_structure.php: bug #1602335, browse distinct values
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index ee32564f1..1fac18611 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1097,7 +1097,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
                 }
             } // end if (1.2.1)
 
-            if ($table == $GLOBALS['cfg']['Bookmark']['table'] && $db == $GLOBALS['cfg']['Bookmark']['db'] && isset($row[1]) && isset($row[0])) {
+            if (isset($GLOBALS['cfg']['Bookmark']['table']) && isset($GLOBALS['cfg']['Bookmark']['db']) && $table == $GLOBALS['cfg']['Bookmark']['table'] && $db == $GLOBALS['cfg']['Bookmark']['db'] && isset($row[1]) && isset($row[0])) {
                 $bookmark_go = '<a href="import.php?'
                                 . PMA_generate_common_url($row[1], '')
                                 . '&amp;id_bookmark=' . $row[0]
diff --git a/sql.php b/sql.php
index 4522a0414..da8e7ab48 100644
--- a/sql.php
+++ b/sql.php
@@ -784,9 +784,9 @@ else {
             }
         } // End INDEX CHECK
 
-        // Bookmark Support if required
+        // Bookmark support if required
         if ($disp_mode[7] == '1'
-            && (isset($cfg['Bookmark']) && $cfg['Bookmark']['db'] && $cfg['Bookmark']['table'] && empty($id_bookmark))
+            && (isset($cfg['Bookmark']) && ! empty($cfg['Bookmark']['db']) && ! empty($cfg['Bookmark']['table']) && empty($id_bookmark))
             && !empty($sql_query)) {
             echo "\n";