diff --git a/ChangeLog b/ChangeLog
index 892bd7374..09872d782 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ $Source$
     * libraries/plugin_interface.lib.php: Add support for hidden inputs.
     * libraries/common.lib.php: Do not forget wrongly configured servers,
       otherwise user gets warning only on first access (RFE #1451521).
+    * libraries/auth/config.auth.lib.php: Show possible error messages.
 
 2006-03-15 Michal Čihař  <michal@cihar.com>
     * libraries/export/htmlexcel.php: Fix output handling (bug #1450555).
diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php
index d78e5bfe2..34a008c6b 100644
--- a/libraries/auth/config.auth.lib.php
+++ b/libraries/auth/config.auth.lib.php
@@ -126,7 +126,12 @@ function PMA_auth_fails()
                 echo '<p>' . $GLOBALS['strAccessDeniedExplanation'] . '</p>' . "\n";
             }
         }
-        PMA_mysqlDie($conn_error, '');
+        PMA_mysqlDie($conn_error, '', true, '', false);
+    }
+    if ( ! empty( $GLOBALS['PMA_errors'] ) && is_array( $GLOBALS['PMA_errors'] ) ) {
+        foreach ( $GLOBALS['PMA_errors'] as $error ) {
+            echo '<div class="error">' . $error . '</div>' . "\n";
+        }
     }
 ?>
         </td>