diff --git a/ChangeLog b/ChangeLog
index 9328ff7ea..8e70a53e1 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-03-28 Marc Delisle  <lem9@users.sourceforge.net>
+	* sql.php3, bug #535648: bookmarks can't be saved on the second server
+
 2002-03-27 Marc Delisle  <lem9@users.sourceforge.net>
 	* libraries/display_tbl.lib.php3, changed a variable name for
 	  better doc.
diff --git a/sql.php3 b/sql.php3
index 2941ad97e..a97d40bbd 100755
--- a/sql.php3
+++ b/sql.php3
@@ -1,14 +1,11 @@
 <?php
 /* $Id$ */
 
-
 /**
  * Gets some core libraries
  */
 require('./libraries/grab_globals.lib.php3');
 require('./libraries/common.lib.php3');
-
-
 /**
  * Defines the url to return to in case of error in a sql statement
  */
@@ -454,6 +451,7 @@ else {
     <br /><br />
     <?php echo $strBookmarkLabel; ?>&nbsp;:
     <input type="hidden" name="goto" value="<?php echo $goto; ?>" />
+    <input type="hidden" name="server" value="<?php echo $server; ?>" />
     <input type="hidden" name="fields[dbase]" value="<?php echo $db; ?>" />
     <input type="hidden" name="fields[user]" value="<?php echo $cfgBookmark['user']; ?>" />
     <input type="hidden" name="fields[query]" value="<?php echo urlencode($sql_query); ?>" />