diff --git a/ChangeLog b/ChangeLog
index 3e08b5f19..bc46f3751 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,7 +30,8 @@ $Source$
     * Documentation.html, config.default.php, libraries/common.lib.php:
       Configurable default connection collation (RFE #1025969).
     * css/phpmyadmin.css.php, libraries/auth/cookie.auth.lib.php: Use
-      fieldsets on login form (RFE #1364546).
+      fieldsets on login form (RFE #1364546), use notice box for cookie
+      information.
 
 2005-11-22 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * added test/theme.php: for testing themes
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index 712abffa5..e779f0461 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -172,7 +172,6 @@ echo sprintf( $GLOBALS['strWelcome'],
 <form method="post" action="index.php" name="login_form"<?php echo $autocomplete; ?> target="_top" class="login">
     <fieldset>
         <legend><?php echo $GLOBALS['strLogin']; ?></legend>
-        <p><?php echo '(' . $GLOBALS['strCookiesRequired'] . ')'; ?></p>
 
 <?php if ($GLOBALS['cfg']['AllowArbitraryServer']) { ?>
         <div class="item">
@@ -260,6 +259,8 @@ echo sprintf( $GLOBALS['strWelcome'],
     </fieldset>
 </form>
 
+<div class="notice"><?php echo $GLOBALS['strCookiesRequired']; ?></div>
+
 <script type="text/javascript" language="javascript">
 <!--
 var uname = document.forms['login_form'].elements['pma_username'];