diff --git a/ChangeLog b/ChangeLog
index bd1dd575d..948bfd1fc 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-06-09 Alexander M. Turek  <me@derrabus.de>
+    * libraries/config_import.lib.php: The default settings should be merged.
+
 2004-06-14 Marc Delisle  <lem9@users.sourceforge.net>
     Changes, thanks to Michael Keck (mkkeck):
     * images/b_tblops.png, themes/darkblue_orange/img/b_tblops.png: new icon
diff --git a/libraries/config_import.lib.php b/libraries/config_import.lib.php
index 29be88152..cf0fd279b 100644
--- a/libraries/config_import.lib.php
+++ b/libraries/config_import.lib.php
@@ -827,16 +827,16 @@ if (!isset($cfg['ReplaceHelpImg'])) {
     $cfg['ReplaceHelpImg'] = TRUE;
 }
 
-if (!isset($cfg['ThemePath'])){
-    $cfg['ThemePath']='';
-    $cfg['ThemeDefault']='';
-    $cfg['ThemeManager'] = FALSE;
+if (!isset($cfg['ThemePath'])) {
+    $cfg['ThemePath'] = 'themes';
+    $cfg['ThemeDefault'] = 'original';
+    $cfg['ThemeManager'] = TRUE;
 } else {
     if (!isset($cfg['ThemeDefault'])){
-        $cfg['ThemeDefault']='original';
+        $cfg['ThemeDefault'] = 'original';
     }
     if (!isset($cfg['ThemeManager'])){
-        $cfg['ThemeManager'] = FALSE;
+        $cfg['ThemeManager'] = TRUE;
     }
 }