diff --git a/admin/setup/config.inc.php b/admin/setup/config.inc.php
index 0bd87e549e..daaf6e3091 100644
--- a/admin/setup/config.inc.php
+++ b/admin/setup/config.inc.php
@@ -7,7 +7,7 @@
    </tr>
 
    <?php $selected = array(); ?>
-   <?php $selected[$current_config['auth_type']] = ' selected'; ?>
+   <?php $selected[$GLOBALS['current_config']['auth_type']] = ' selected'; ?>
    <tr bgcolor="e6e6e6">
     <td>Select which type of authentication you are using.</td>
     <td>
@@ -23,7 +23,7 @@
    </tr>
 
    <?php $selected = array(); ?>
-   <?php $selected[$current_config['account_repository']] = ' selected'; ?>
+   <?php $selected[$GLOBALS['current_config']['account_repository']] = ' selected'; ?>
    <tr bgcolor="e6e6e6">
     <td>Select where you want to store/retrieve user accounts.</td>
     <td>
@@ -36,7 +36,7 @@
    </tr>
 
    <?php $selected = array(); ?>
-   <?php $selected[$current_config['file_repository']] = ' selected'; ?>
+   <?php $selected[$GLOBALS['current_config']['file_repository']] = ' selected'; ?>
    <tr bgcolor="e6e6e6">
     <td>Select where you want to store/retrieve filesystem information.</td>
     <td>
@@ -48,15 +48,15 @@
 
    <tr bgcolor="e6e6e6">
     <td>Minimum account id (e.g. 500 or 100, etc.):</td>
-    <td><input name="newsettings[account_min_id]" value="<?php echo $current_config['account_min_id']; ?>"></td>
+    <td><input name="newsettings[account_min_id]" value="<?php echo $GLOBALS['current_config']['account_min_id']; ?>"></td>
    </tr>
    <tr bgcolor="e6e6e6">
     <td>Maximum account id (e.g. 65535 or 1000000):</td>
-    <td><input name="newsettings[account_max_id]" value="<?php echo $current_config['account_max_id']; ?>"></td>
+    <td><input name="newsettings[account_max_id]" value="<?php echo $GLOBALS['current_config']['account_max_id']; ?>"></td>
    </tr>
 
    <?php $selected = array(); ?>
-   <?php $selected[$current_config['ldap_extra_attributes']] = ' selected'; ?>
+   <?php $selected[$GLOBALS['current_config']['ldap_extra_attributes']] = ' selected'; ?>
    <tr bgcolor="e6e6e6">
      <td>If using LDAP, do you want to manage homedirectory and loginshell attributes?:</td>
      <td>
@@ -69,16 +69,16 @@
 
    <tr bgcolor="e6e6e6">
     <td>&nbsp;&nbsp;&nbsp;LDAP Default homedirectory prefix (e.g. /home for /home/username):</td>
-    <td><input name="newsettings[ldap_account_home]" value="<?php echo $current_config['ldap_account_home']; ?>"></td>
+    <td><input name="newsettings[ldap_account_home]" value="<?php echo $GLOBALS['current_config']['ldap_account_home']; ?>"></td>
    </tr>
 
    <tr bgcolor="e6e6e6">
     <td>&nbsp;&nbsp;&nbsp;LDAP Default shell (e.g. /bin/bash):</td>
-    <td><input name="newsettings[ldap_account_shell]" value="<?php echo $current_config['ldap_account_shell']; ?>"></td>
+    <td><input name="newsettings[ldap_account_shell]" value="<?php echo $GLOBALS['current_config']['ldap_account_shell']; ?>"></td>
    </tr>
 
    <?php $selected = array(); ?>
-   <?php $selected[$current_config['auto_create_acct']] = ' selected'; ?>
+   <?php $selected[$GLOBALS['current_config']['auto_create_acct']] = ' selected'; ?>
    <tr bgcolor="e6e6e6">
      <td>Auto create account records for authenticated users:</td>
      <td>
@@ -91,11 +91,11 @@
 
    <tr bgcolor="e6e6e6">
     <td>Add auto-created users to this group ('Default' will be attempted if this is empty.):</td>
-    <td><input name="newsettings[default_group_lid]" value="<?php echo $current_config['default_group_lid']; ?>"></td>
+    <td><input name="newsettings[default_group_lid]" value="<?php echo $GLOBALS['current_config']['default_group_lid']; ?>"></td>
    </tr>
 
    <?php $selected = array(); ?>
-   <?php $selected[$current_config['acl_default']] = ' selected'; ?>
+   <?php $selected[$GLOBALS['current_config']['acl_default']] = ' selected'; ?>
    <tr bgcolor="e6e6e6">
     <td>If no ACL records for user or any group the user is a member of: </td>
     <td>
@@ -108,31 +108,31 @@
 
    <tr bgcolor="e6e6e6">
     <td>LDAP host:</td>
-    <td><input name="newsettings[ldap_host]" value="<?php echo $current_config['ldap_host']; ?>"></td>
+    <td><input name="newsettings[ldap_host]" value="<?php echo $GLOBALS['current_config']['ldap_host']; ?>"></td>
    </tr>
 
    <tr bgcolor="e6e6e6">
     <td>LDAP accounts context:</td>
-    <td><input name="newsettings[ldap_context]" value="<?php echo $current_config['ldap_context']; ?>" size="40"></td>
+    <td><input name="newsettings[ldap_context]" value="<?php echo $GLOBALS['current_config']['ldap_context']; ?>" size="40"></td>
    </tr>
 
    <tr bgcolor="e6e6e6">
     <td>LDAP groups context:</td>
-    <td><input name="newsettings[ldap_group_context]" value="<?php echo $current_config['ldap_group_context']; ?>" size="40"></td>
+    <td><input name="newsettings[ldap_group_context]" value="<?php echo $GLOBALS['current_config']['ldap_group_context']; ?>" size="40"></td>
    </tr>
 
    <tr bgcolor="e6e6e6">
     <td>LDAP root dn:</td>
-    <td><input name="newsettings[ldap_root_dn]" value="<?php echo $current_config['ldap_root_dn']; ?>" size="40"></td>
+    <td><input name="newsettings[ldap_root_dn]" value="<?php echo $GLOBALS['current_config']['ldap_root_dn']; ?>" size="40"></td>
    </tr>
 
    <tr bgcolor="e6e6e6">
     <td>LDAP root password:</td>
-    <td><input name="newsettings[ldap_root_pw]" type="password" value="<?php echo $current_config['ldap_root_pw']; ?>"></td>
+    <td><input name="newsettings[ldap_root_pw]" type="password" value="<?php echo $GLOBALS['current_config']['ldap_root_pw']; ?>"></td>
    </tr>
 
    <?php $selected = array(); ?>
-   <?php $selected[$current_config["ldap_encryption_type"]] = ' selected'; ?>
+   <?php $selected[$GLOBALS['current_config']['ldap_encryption_type']] = ' selected'; ?>
    <tr bgcolor="e6e6e6">
     <td>LDAP encryption type</td>
     <td>
@@ -146,5 +146,5 @@
 
    <tr bgcolor="e6e6e6">
     <td>Enter some random text for app_session <br>encryption (requires mcrypt)</td>
-    <td><input name="newsettings[encryptkey]" value="<?php echo $current_config['encryptkey']; ?>" size="40"></td>
+    <td><input name="newsettings[encryptkey]" value="<?php echo $GLOBALS['current_config']['encryptkey']; ?>" size="40"></td>
    </tr>
diff --git a/phpgwapi/setup/config.inc.php b/phpgwapi/setup/config.inc.php
index b67028d77d..009404306e 100644
--- a/phpgwapi/setup/config.inc.php
+++ b/phpgwapi/setup/config.inc.php
@@ -5,17 +5,17 @@
    </tr>
    <tr bgcolor="e6e6e6">
     <td>Enter the full path for temporary files.<br>Examples: /tmp, C:\TEMP</td>
-    <td><input name="newsettings[temp_dir]" value="<?php echo $current_config['temp_dir']; ?>" size="40"></td>
+    <td><input name="newsettings[temp_dir]" value="<?php echo $GLOBALS['current_config']['temp_dir']; ?>" size="40"></td>
    </tr>
 
    <tr bgcolor="e6e6e6">
     <td>Enter the full path for users and group files.<br>Examples: /files, E:\FILES</td>
-    <td><input name="newsettings[files_dir]" value="<?php echo $current_config['files_dir']; ?>" size="40"></td>
+    <td><input name="newsettings[files_dir]" value="<?php echo $GLOBALS['current_config']['files_dir']; ?>" size="40"></td>
    </tr>
    
    <tr bgcolor="e6e6e6">
     <td>Enter the location of phpGroupWare's URL.<br>Example: http://www.domain.com/phpgroupware &nbsp; or &nbsp; /phpgroupware<br><b>No trailing slash</b></td>
-    <td><input name="newsettings[webserver_url]" value="<?php echo $current_config['webserver_url']; ?>" size="40"></td>
+    <td><input name="newsettings[webserver_url]" value="<?php echo $GLOBALS['current_config']['webserver_url']; ?>" size="40"></td>
    </tr>
 
    <tr bgcolor="FFFFFF">
@@ -27,7 +27,7 @@
    </tr>
 
    <tr bgcolor="e6e6e6">
-	<?php if ($current_config['hostname']) { $thishostname = $current_config['hostname']; }
+	<?php if ($GLOBALS['current_config']['hostname']) { $thishostname = $GLOBALS['current_config']['hostname']; }
 		else { $thishostname = $SERVER_NAME; }
 	?>
     <td>Enter the hostname of the machine on which this server is running.</td>
@@ -36,11 +36,11 @@
 
    <tr bgcolor="e6e6e6">
     <td>Enter your default FTP server.</td>
-    <td><input name="newsettings[default_ftp_server]" value="<?php echo $current_config['default_ftp_server']; ?>"></td>
+    <td><input name="newsettings[default_ftp_server]" value="<?php echo $GLOBALS['current_config']['default_ftp_server']; ?>"></td>
    </tr>
 
    <?php $selected = array(); ?>
-   <?php $selected[@$current_config['ftp_use_mime']] = " selected"; ?>
+   <?php $selected[@$GLOBALS['current_config']['ftp_use_mime']] = ' selected'; ?>
    <tr bgcolor="e6e6e6">
     <td>Attempt to use correct mimetype for FTP instead of default 'application/octet-stream'.</td>
     <td>
@@ -53,10 +53,10 @@
 
    <tr bgcolor="e6e6e6">
     <td>Enter your HTTP proxy server.</td>
-    <td><input name="newsettings[httpproxy_server]" value="<?php echo $current_config['httpproxy_server']; ?>"></td>
+    <td><input name="newsettings[httpproxy_server]" value="<?php echo $GLOBALS['current_config']['httpproxy_server']; ?>"></td>
    </tr>
 
    <tr bgcolor="e6e6e6">
     <td>Enter your HTTP proxy server port.</td>
-    <td><input name="newsettings[httpproxy_port]" value="<?php echo $current_config['httpproxy_port']; ?>"></td>
+    <td><input name="newsettings[httpproxy_port]" value="<?php echo $GLOBALS['current_config']['httpproxy_port']; ?>"></td>
    </tr>
diff --git a/preferences/setup/config.inc.php b/preferences/setup/config.inc.php
index a0cd8d2c84..d4cee1aeb3 100644
--- a/preferences/setup/config.inc.php
+++ b/preferences/setup/config.inc.php
@@ -8,22 +8,22 @@
 
    <tr bgcolor="e6e6e6">
     <td>Enter the title for your site.</td>
-    <td><input name="newsettings[site_title]" value="<?php echo $current_config["site_title"]; ?>"></td>
+    <td><input name="newsettings[site_title]" value="<?php echo $GLOBALS['current_config']['site_title']; ?>"></td>
    </tr>
 
-   <?php $selected[$current_config["showpoweredbyon"]] = " selected"; ?>
+   <?php $selected[$GLOBALS['current_config']['showpoweredbyon']] = ' selected'; ?>
    <tr bgcolor="e6e6e6">
     <td>Show 'powered by' logo on:</td>
     <td>
      <select name="newsettings[showpoweredbyon]">
-      <option value="bottom"<?php echo $selected["bottom"]; ?>>bottom</option>
-      <option value="top"<?php echo $selected["top"]; ?>>top</option>
+      <option value="bottom"<?php echo $selected['bottom']; ?>>bottom</option>
+      <option value="top"<?php echo $selected['top']; ?>>top</option>
      </select>
     </td>
    </tr>
    <?php $selected = array(); ?>
 
-   <?php $selected[$current_config["countrylist"]] = " selected"; ?>
+   <?php $selected[$GLOBALS['current_config']['countrylist']] = ' selected'; ?>
    <tr bgcolor="e6e6e6">
     <td>Country Selection (Text Entry/SelectBox):</td>
     <td>
@@ -38,7 +38,7 @@
    <?php $selected = array(); ?>
 
    <?php $selected = array(); ?>
-   <?php $selected[$current_config['htmlcompliant']] = ' selected'; ?>
+   <?php $selected[$GLOBALS['current_config']['htmlcompliant']] = ' selected'; ?>
    <tr bgcolor="e6e6e6">
      <td>Use pure HTML compliant code (not fully working yet):</td>
      <td>
@@ -50,7 +50,7 @@
     </tr>
 
    <?php $selected = array(); ?>
-   <?php $selected[$current_config['usecookies']] = ' selected'; ?>
+   <?php $selected[$GLOBALS['current_config']['usecookies']] = ' selected'; ?>
    <tr bgcolor="e6e6e6">
      <td>Use cookies to pass sessionid:</td>
      <td>
@@ -62,7 +62,7 @@
     </tr>
 
    <?php $selected = array(); ?>
-   <?php $selected[$current_config['checkfornewversion']] = ' selected'; ?>
+   <?php $selected[$GLOBALS['current_config']['checkfornewversion']] = ' selected'; ?>
    <tr bgcolor="e6e6e6">
      <td>Would you like phpGroupWare to check for new version<br>when admins login ?:</td>
      <td>
@@ -74,7 +74,7 @@
     </tr>
 
    <?php $selected = array(); ?>
-   <?php $selected[$current_config['cache_phpgw_info']] = ' selected'; ?>
+   <?php $selected[$GLOBALS['current_config']['cache_phpgw_info']] = ' selected'; ?>
    <tr bgcolor="e6e6e6">
      <td>Would you like phpGroupWare to cache the phpgw_info array ?:</td>
      <td>
@@ -90,9 +90,9 @@
    <tr bgcolor="e6e6e6">
      <td>Default file system space per user/group ?:</td>
      <td>
-      <input type="text" name="newsettings[vfs_default_account_size_number]" size="7" value="<?php echo $current_config['vfs_default_account_size_number']; ?> ">
+      <input type="text" name="newsettings[vfs_default_account_size_number]" size="7" value="<?php echo $GLOBALS['current_config']['vfs_default_account_size_number']; ?> ">
 	&nbsp;&nbsp;
-   <?php $selected[$current_config['vfs_default_account_size_type']] = ' selected'; ?>
+   <?php $selected[$GLOBALS['current_config']['vfs_default_account_size_type']] = ' selected'; ?>
       <select name="newsettings[vfs_default_account_size_type]">
        <option value="gb" <?php echo $selected['gb']?>>GB</option>
        <option value="mb" <?php echo $selected['mb']?>>MB</option>