diff --git a/ChangeLog b/ChangeLog
index d1b1b5c58..769da4707 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #1805773 [relations] browse foreign values: return values not escaped,
   thanks to Alex Rambau
 - bug #1798786 [import] Wrong error message when a string contains semicolon
+- bug #1807923 [login] Login with html entities in password fails
 
 2.11.1.0 (2007-09-20)
 
diff --git a/libraries/cleanup.lib.php b/libraries/cleanup.lib.php
index b6d1d3a5c..05ebe5d23 100644
--- a/libraries/cleanup.lib.php
+++ b/libraries/cleanup.lib.php
@@ -14,36 +14,29 @@
  * @access public
  * @author  Michal Cihar (michal@cihar.com)
  */
-function PMA_remove_request_vars(&$whitelist) {
+function PMA_remove_request_vars(&$whitelist)
+{
     // do not check only $_REQUEST because it could have been overwritten
     // and use type casting because the variables could have become
     // strings
     $keys = array_keys(array_merge((array)$_REQUEST, (array)$_GET, (array)$_POST, (array)$_COOKIE));
 
     foreach($keys as $key) {
-        if (!in_array($key, $whitelist)) {
+        if (! in_array($key, $whitelist)) {
             unset($_REQUEST[$key], $_GET[$key], $_POST[$key], $GLOBALS[$key]);
         } else {
             // allowed stuff could be compromised so escape it
             // we require it to be a string
-            if (isset($_REQUEST[$key]) && is_string($_REQUEST[$key])) {
-                $_REQUEST[$key] = htmlspecialchars($_REQUEST[$key], ENT_QUOTES);
-            } else {
+            if (isset($_REQUEST[$key]) && ! is_string($_REQUEST[$key])) {
                 unset($_REQUEST[$key]);
             }
-            if (isset($_POST[$key]) && is_string($_POST[$key])) {
-                $_POST[$key] = htmlspecialchars($_POST[$key], ENT_QUOTES);
-            } else {
+            if (isset($_POST[$key]) && ! is_string($_POST[$key])) {
                 unset($_POST[$key]);
             }
-            if (isset($_COOKIE[$key]) && is_string($_COOKIE[$key])) {
-                $_COOKIE[$key] = htmlspecialchars($_COOKIE[$key], ENT_QUOTES);
-            } else {
+            if (isset($_COOKIE[$key]) && ! is_string($_COOKIE[$key])) {
                 unset($_COOKIE[$key]);
             }
-            if (isset($_GET[$key]) && is_string($_GET[$key])) {
-                $_GET[$key] = htmlspecialchars($_GET[$key], ENT_QUOTES);
-            } else {
+            if (isset($_GET[$key]) && ! is_string($_GET[$key])) {
                 unset($_GET[$key]);
             }
         }