diff --git a/ChangeLog b/ChangeLog
index 1f9cd7931..6c9aeb850 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,18 +5,22 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-07-07 Alexander M. Turek  <rabus@users.sourceforge.net>
+    * libraries/common.lib.php3, libraries/config_import.lib.php3: Backwards
+      compatibility.
+
 2003-07-07 Garvin Hicking <me@supergarv.de>
-    * tbl_change.php3: Fix undefined index for disp_query 
+    * tbl_change.php3: Fix undefined index for disp_query
       (when inserting a new row with a file uploaded to a column)
     * libraries/transformations/image_jpeg__inline.inc.php3,
       libraries/transformations/image_png__inline.inc.php3: Proper escaping
       of &amp;
     * libraries/common.lib.php3, libraries/defines.lib.php3: Safari detection,
       smaller default font size (like OPERA). Bug #752646.
-    
+
 2003-07-07 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/auth/cookie.auth.lib.php3, config.inc.php3, user_password.php3,
-      Documentation.html: only one blowfish secret is necessary for 
+      Documentation.html: only one blowfish secret is necessary for
       all servers, thanks to Alexander M. Turek
     ### 2.5.2-rc1 released
 
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index aa42f9f36..af3545105 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -138,7 +138,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
      * Includes compatibility code for older config.inc.php3 revisions
      * if necessary
      */
-    if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 189) {
+    if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 190) {
         include('./libraries/config_import.lib.php3');
     }
 
diff --git a/libraries/config_import.lib.php3 b/libraries/config_import.lib.php3
index fb0fdb61d..499e018d8 100644
--- a/libraries/config_import.lib.php3
+++ b/libraries/config_import.lib.php3
@@ -56,6 +56,19 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
         }
     }
 
+    if (!isset($cfg['PmaAbsoluteUri_DisableWarning'])) {
+        $cfg['PmaAbsoluteUri_DisableWarning'] = FALSE;
+    }
+
+    if (!isset($cfg['PmaNoRelation_DisableWarning'])) {
+        $cfg['PmaNoRelation_DisableWarning'] = FALSE;
+    }
+
+    // do not set a default value here!
+    if (!isset($cfg['blowfish_secret'])) {
+        $cfg['blowfish_secret'] = '';
+    }
+
     if (!isset($cfg['Servers'])) {
         if (isset($cfgServers)) {
             $cfg['Servers'] = $cfgServers;
@@ -98,10 +111,12 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
                 unset($cfg['Servers'][$i]['adv_auth']);
             }
 
-// do not put a default value here, we want to output an error to force
-// the installer to enter his own secret
-            if (!isset($cfg['Servers'][$i]['blowfish_secret'])) {
-                $cfg['Servers'][$i]['blowfish_secret']  = '';
+            // for users who use the "first" blowfish mechanism
+            if (isset($cfg['Servers'][$i]['blowfish_secret'])) {
+                if (empty($cfg['blowfish_secret'])) {
+                    $cfg['blowfish_secret'] = $cfg['Servers'][$i]['blowfish_secret'];
+                }
+                unset($cfg['Servers'][$i]['blowfish_secret']);
             }
 
             if (!isset($cfg['Servers'][$i]['compress'])) {
@@ -1027,7 +1042,7 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
            'ENUM'         => '',
            'SET'          => ''
         );
-    
+
         // Map above defined groups to any function
         $cfg['RestrictFunctions'] = array(
             'FUNC_CHAR'   => array(
@@ -1043,7 +1058,7 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
                 'USER',
                 'CONCAT'
             ),
-    
+
             'FUNC_DATE'   => array(
                 'NOW',
                 'CURDATE',
@@ -1056,7 +1071,7 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
                 'UNIX_TIMESTAMP',
                 'WEEKDAY'
             ),
-    
+
             'FUNC_NUMBER' => array(
                 'ASCII',
                 'CHAR',
@@ -1071,12 +1086,6 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
         );
     }
 
-    if (!isset($cfg['PmaAbsoluteUri_DisableWarning'])) {
-        $cfg['PmaAbsoluteUri_DisableWarning'] = FALSE;
-    }
-    if (!isset($cfg['PmaNoRelation_DisableWarning'])) {
-        $cfg['PmaNoRelation_DisableWarning'] = FALSE;
-    }
     if (!isset($cfg['GD2Available'])) {
         $cfg['GD2Available'] = 'auto';
     }