diff --git a/ChangeLog b/ChangeLog
index e7cd771ec..f31529273 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ $Source$
 2005-11-28 Michal Čihař  <michal@cihar.com>
     * scripts/setup.php: Don't allow loading of configuration if there is no
       write permission on config.
+    * libraries/auth/cookie.auth.lib.php: Display PMA_errors on login form.
 
 2005-11-28 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * libraries/Theme.class.php, libraries/Theme_Manager.class.php:
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index d97a40ce3..298200a3e 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -234,6 +234,14 @@ echo sprintf( $GLOBALS['strWelcome'],
 
 <div class="notice"><?php echo $GLOBALS['strCookiesRequired']; ?></div>
 
+<?php
+if ( ! empty( $GLOBALS['PMA_errors'] ) && is_array( $GLOBALS['PMA_errors'] ) ) {
+    foreach( $GLOBALS['PMA_errors'] as $error ) {
+        echo '<div class="error">' . $error . '</div>' . "\n";
+    }
+}
+?>
+
 <script type="text/javascript" language="javascript">
 <!--
 var uname = document.forms['login_form'].elements['pma_username'];