diff --git a/ChangeLog b/ChangeLog
index 54510199e..441dfc31f 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@ $Source$
       - Patch #548696 (DB/Table titles should be links), thanks to
         Ray Black <allah03@users.sourceforge.net>.
       - lines: 161-164: Undefined variable
+    * common.lib.php3, lines 162, 163, 435-437: Fixed bug #549570
+      (Strange error if controluser is invalid)
 
 2002-04-27 Loïc Chapeaux  <lolo@phpheaven.net>
     * Documentation.html:
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index 3f3e9deff..c7bfdcd85 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -159,6 +159,8 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
     {
 
         if (empty($GLOBALS['is_header_sent'])) {
+            // rabus: If we include header.inc.php3 here, we get a huge set of
+            // "Undefined variable" errors (see bug #549570)!
             include('./header.inc.php3');
         }
 
@@ -430,6 +432,9 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
                                 . $cfg['Server']['host'] . $server_port . $server_socket . ', '
                                 . $cfg['Server']['controluser'] . ', '
                                 . $cfg['Server']['controlpass'] . ')';
+                if (empty($GLOBALS['is_header_sent'])) {
+                    include('./header.inc.php3');
+                }
                 PMA_mysqlDie($conn_error, $local_query, FALSE);
             } // end if
         } // end if