diff --git a/ChangeLog b/ChangeLog
index 90d51f0ac..56d19acab 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,7 @@ $Source$
 	* scripts/*: Updated comments somewhat
 	* tbl_dump.php3:121: renamed $cfgServer_backup to $backup_cfgServer	
 	* user_details.php3: forgot to change $GLOBALS['cfgXYZ'] to $GLOBALS['cfg']['XYZ']
+	* libraries/common.lib.php3: a single $cfgServer instance was forgotten
 
 2002-04-23 Marc Delisle  <lem9@users.sourceforge.net>
 	* tbl_printview.php3, lang/*.php3: Relation links in printview,
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index 6d3649f91..8ad8f1d27 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -88,7 +88,7 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
     // output buffering should be run
     if (PMA_PHP_INT_VERSION < 40000
         || (PMA_PHP_INT_VERSION >= 40005 && @ini_get('zlib.output_compression'))) {
-        $cfgOBGzip = FALSE;
+        $cfg['OBGzip'] = FALSE;
     }
 
 
@@ -361,7 +361,7 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
      * Otherwise, set up $cfg['Server'] and do the usual login stuff.
      */
     else if (isset($cfg['Servers'][$server])) {
-        $cfgServer = $cfg['Servers'][$server];
+        $cfg['Server'] = $cfg['Servers'][$server];
 
         // Check how the config says to connect to the server
         $server_port   = (empty($cfg['Server']['port']))