diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index e96e505f60..c08c650a32 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -32,10 +32,6 @@ $config['project_id']     = strtolower($config['project_name']);
 
 $config['temp_dir']      = "/tmp";
 $config['install_dir']   = "/opt/" . $config['project_id'];
-$config['html_dir']      = $config['install_dir'] . "/html";
-$config['rrd_dir']       = $config['install_dir'] . "/rrd";
-$config['log_dir']       = $config['install_dir'] . "/logs";
-$config['log_file']      = $config['log_dir'] . "/" . $config['project_id'] . ".log";
 
 // What is my own hostname (used to identify this host in its own database)
 $config['own_hostname'] = "localhost";
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index dae7f70622..9e99b41b75 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1213,4 +1213,10 @@ $config['ipmi_unit']['discrete']  = '';
 // INCLUDE THE VMWARE DEFINITION FILE.
 require_once("vmware_guestid.inc.php");
 
+// Define some variables if they aren't set by user definition in config.php
+if (!isset($config['html_dir'])) { $config['html_dir'] = $config['install_dir'] . '/html'; }
+if (!isset($config['rrd_dir']))  { $config['rrd_dir']  = $config['install_dir'] . '/rrd'; }
+if (!isset($config['log_dir']))  { $config['log_dir']  = $config['install_dir'] . '/logs'; }
+if (!isset($config['log_file'])) { $config['log_dir'] . "/" . $config['project_id'] . ".log"; }
+
 ?>