diff --git a/ChangeLog b/ChangeLog
index d590e1e9a..3a8a4741b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,11 @@ $Source$
 	* libraries/auth:
 	  - basic.auth.lib.php3, line 107: fixed an horrible parse error;
 	  - cookie.auth.lib.php3: beautified a bit the display.
+	* db_details.php3, line 461; tbl_properties.php3, line 694;
+	  libraries/common.lib.php3, lines 821 & 823: patch from Cal Henderson
+	  to be taken right to the edit box after clicking on a "Modify" link.
+	* main.php3: the link to the logout problem with http authentication mode
+	  was also displayed with cookie authentication mode.
 
 2001-12-09  Loïc Chapeaux  <lolo@phpheaven.net>
 	* read_dump.php3; libraries/build_dump.lib.php3: sending the "fake" header
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index 4b4f3485d..cdda46e30 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -818,9 +818,9 @@ window.parent.frames['nav'].location.replace('<?php echo $reload_url; ?>');
                     $edit_target = '';
                 }
                 if ($edit_target == 'tbl_properties.php3') {
-                    $edit_link = '<a href="tbl_properties.php3?lang=' . $GLOBALS['lang'] . '&amp;server=' . urlencode($GLOBALS['server']) . '&amp;db=' . urlencode($GLOBALS['db']) . '&amp;table=' . urlencode($GLOBALS['table']) . '&amp;sql_query=' . urlencode($GLOBALS['sql_query']) . '&amp;show_query=y">' . $GLOBALS['strEdit'] . '</a>';
+                    $edit_link = '<a href="tbl_properties.php3?lang=' . $GLOBALS['lang'] . '&amp;server=' . urlencode($GLOBALS['server']) . '&amp;db=' . urlencode($GLOBALS['db']) . '&amp;table=' . urlencode($GLOBALS['table']) . '&amp;sql_query=' . urlencode($GLOBALS['sql_query']) . '&amp;show_query=y#querybox">' . $GLOBALS['strEdit'] . '</a>';
                 } else if ($edit_target != '') {
-                    $edit_link = '<a href="db_details.php3?lang=' . $GLOBALS['lang'] . '&amp;server=' . urlencode($GLOBALS['server']) . '&amp;db=' . urlencode($GLOBALS['db']) . '&amp;sql_query=' . urlencode($GLOBALS['sql_query']) . '&amp;show_query=y">' . $GLOBALS['strEdit'] . '</a>';
+                    $edit_link = '<a href="db_details.php3?lang=' . $GLOBALS['lang'] . '&amp;server=' . urlencode($GLOBALS['server']) . '&amp;db=' . urlencode($GLOBALS['db']) . '&amp;sql_query=' . urlencode($GLOBALS['sql_query']) . '&amp;show_query=y#querybox">' . $GLOBALS['strEdit'] . '</a>';
                 }
             }
             if (!empty($edit_target)) {
diff --git a/main.php3 b/main.php3
index e534f0015..91e63a9f8 100755
--- a/main.php3
+++ b/main.php3
@@ -327,14 +327,16 @@ if ($server > 0) {
 
         // Logout for advanced authentication
         if ($cfgServer['auth_type'] != 'basic') {
+            $http_logout = ($cfgServer['auth_type'] == 'http')
+                         ? "\n" . '                <a href="' . $cfgPmaAbsoluteUri . 'Documentation.html#login_bug" target="documentation">(*)</a>'
+                         : '';
             echo "\n";
             ?>
         <tr>
             <td valign="baseline"><img src="<?php echo $item_img; ?>" width="7" height="7" alt="item" /></td>
             <td>
                 <a href="index.php3?<?php echo $common_url_query; ?>&amp;old_usr=<?php echo urlencode($PHP_AUTH_USER); ?>" target="_parent">
-                    <b><?php echo $strLogout; ?></b></a>&nbsp;
-                <a href="<?php echo $cfgPmaAbsoluteUri; ?>Documentation.html#login_bug" target="documentation">(*)</a>
+                    <b><?php echo $strLogout; ?></b></a>&nbsp;<?php echo $http_logout . "\n"; ?>
             </td>
         </tr>
             <?php