Index: .
===================================================================
--- .	(revision 21362)
+++ .	(working copy)
@@ -262,10 +262,39 @@
 {
     eZSys::clearAccessPath();
 }
-changeAccess( $access );
+
+/*
+    To get the right INIOverrideDirList we have do do something
+    1. We delete all entry how are related to the admin siteaccess which want to diplay an ini setting from another siteaccess
+    2. change to new siteaccess using the global inis
+    3. Load the new siteaccess extensions
+*/
+if( $GLOBALS['eZCurrentAccess']['name'] != $siteAccess )
+{
+    // 1. delete all entry which are related to the old siteaccess
+    $newINIOverrideDirList = array();
+    foreach ( array_reverse( $GLOBALS['eZINIOverrideDirList'] ) as $dir )
+    {
+        $path = $dir[0];
+        if( ereg('siteaccess', $path) )
+        {
+            break;
+        }
+        else
+        {
+            $newINIOverrideDirList[] = $dir;
+        }
+    }
+    $iniOverrideDirListWithoutSiteaccess = array_reverse( $newINIOverrideDirList );
+
+    $GLOBALS['eZINIOverrideDirList'] = $iniOverrideDirListWithoutSiteaccess;
 
-// Load the siteaccess extensions
-eZExtension::activateExtensions( 'access' );
+    // 2. change to new siteaccess using the global inis
+    changeAccess( $access );
+
+    // 3. Load the new siteaccess extensions
+    eZExtension::activateExtensions( 'access' );
+}
 
 // Change content object default language
 $GLOBALS['eZContentObjectDefaultLanguage'] = $LanguageCode;