diff --git a/ChangeLog b/ChangeLog
index 0de7681e9..cd1b3c660 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@ $Source$
     * lang/galician: Update, thanks to Xosé Calvo - xosecalvo.
     * lang/estonian: Update, thanks to Marko Ellermaa - uhuu
     * lang/russian: update, thanks to Gosha Sakovich - gt2
+    * libraries/common.lib.php: bug #1534475, arbitrary server
 
 2006-08-09 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/mysql_charsets.lib.php: bug #1530574:
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 6fa55e647..03a05bcd8 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2859,7 +2859,7 @@ if (!isset($_REQUEST['token']) || $_SESSION['PMA_token'] != $_REQUEST['token'])
         /* Cookie preferences */
         'pma_lang', 'pma_charset', 'pma_collation_connection', 'pma_convcharset',
         /* Possible login form */
-        'pma_username', 'pma_password',
+        'pma_servername', 'pma_username', 'pma_password',
     );
     $keys = array_keys($_REQUEST);
     /* Remove any non allowed stuff from requests */