diff --git a/ChangeLog b/ChangeLog
index 53afe7c69..6b034d143 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2006-04-25 Michal Čihař  <michal@cihar.com>
+    * libraries/common.lib.php: Make cookie login form work with token
+      protection.
+
 2006-04-25 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * db_details_qbe.php, db_printview.php, libraries/display_tbl.lib.php,
       css/phpmyadmin.css.php, js/functions.js, pdf_pages.php:
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 2663d1215..bc59b0976 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2779,6 +2779,8 @@ if (!isset($_REQUEST['token']) || $_SESSION['PMA_token'] != $_REQUEST['token'])
         'phpMyAdmin', 
         /* Cookie preferences */
         'pma_lang', 'pma_charset', 'pma_collation_connection', 'pma_convcharset',
+        /* Possible login form */
+        'pma_username', 'pma_password',
     );
     $keys = array_keys($_REQUEST);
     /* Remove any non allowed stuff from requests */