diff --git a/ChangeLog b/ChangeLog
index 7d5394c4a..93e97315b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,7 @@ $Source$
     * libraries/common.lib.php: Do not complain if config file is not present,
       as we can still work in this case (bug #1364647).
     * lang/*: Added missing $strInvalidServerHostname.
+    * libraries/auth/cookie.auth.lib.php: Move error message on top of page.
 
 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 95724f6a1..64d5c4307 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -140,6 +140,13 @@ echo sprintf( $GLOBALS['strWelcome'],
 ?>
 </h1>
     <?php
+
+    // Show error message
+    if ( !empty($conn_error)) {
+        echo '<div class="error"><h1>' . $GLOBALS['strError'] . '</h1>' . "\n";
+        echo $conn_error . '</div>' . "\n";
+    }
+    
     // Displays the languages form
     if (empty($cfg['Lang'])) {
         echo "\n";
@@ -161,11 +168,6 @@ echo sprintf( $GLOBALS['strWelcome'],
            . '</html>';
         exit();
     }
-
-    if ( !empty($conn_error)) {
-        echo '<div class="error"><h1>' . $GLOBALS['strError'] . '</h1>' . "\n";
-        echo $conn_error . '</div>' . "\n";
-    }
 ?>
 <br />
 <!-- Login form -->