diff --git a/ChangeLog b/ChangeLog
index ddeab207c..46c8a07ed 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@ $Source$
 2005-07-24 Michal Čihař  <michal@cihar.com>
     * libraries/check_user_privileges.lib.php: Undefined variable (bug
       #1243885).
+    * ibraries/config_import.lib.php: Do not override theme properties when
+      path is not set.
 
 2005-07-23 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_properties_structure.php, tbl_properties.inc.php:
diff --git a/libraries/config_import.lib.php b/libraries/config_import.lib.php
index 7553153cb..8d69cb879 100644
--- a/libraries/config_import.lib.php
+++ b/libraries/config_import.lib.php
@@ -754,16 +754,14 @@ if (!isset($cfg['ReplaceHelpImg'])) {
 
 if (!isset($cfg['ThemePath'])) {
     $cfg['ThemePath'] = './themes';
-    $cfg['ThemeDefault'] = 'original';
-    $cfg['ThemeManager'] = TRUE;
-} else {
-    if (!isset($cfg['ThemeDefault'])){
-        $cfg['ThemeDefault'] = 'original';
-    }
-    if (!isset($cfg['ThemeManager'])){
-        $cfg['ThemeManager'] = TRUE;
-    }
 }
+if (!isset($cfg['ThemeDefault'])){
+    $cfg['ThemeDefault'] = 'original';
+}
+if (!isset($cfg['ThemeManager'])){
+    $cfg['ThemeManager'] = TRUE;
+}
+
 if (!isset($cfg['ThemePerServer'])){
     $cfg['ThemePerServer'] = FALSE;
 }