diff --git a/web/includes/config.php.in b/web/includes/config.php.in
index 3426f9cd1..faaa47df3 100644
--- a/web/includes/config.php.in
+++ b/web/includes/config.php.in
@@ -28,6 +28,7 @@ define( 'ZM_VERSION', '@VERSION@' );               // Version
 define( 'ZM_DIR_TEMP', '@ZM_TMPDIR@' );
 define( 'ZM_DIR_CACHE', '@ZM_CACHEDIR@' );
 global $zm_configvals;
+global $zm_config;
 
 $configFile = ZM_CONFIG;
 $localConfigFile = basename($configFile);
@@ -230,10 +231,9 @@ $GLOBALS['defaultUser'] = array(
 
 function loadConfig( $defineConsts=true ) {
   global $zm_config;
+  global $zm_configvals;
   global $dbConn;
 
-  $config = array();
-
   $result = $dbConn->query('SELECT Name,Value,Type,Private FROM Config');
   if ( !$result )
     echo mysql_error();
@@ -248,6 +248,7 @@ function loadConfig( $defineConsts=true ) {
         $zm_config[$row['Name']]['Value'] = constant($row['Name']);
       }
     }
+    if (!isset($zm_configvals[$row['Name']])) $zm_configvals[$row['Name']] = $row['Value'];
   }
   return $zm_config;
 } # end function loadConfig