diff --git a/application/loginwebpage.class.inc.php b/application/loginwebpage.class.inc.php
index 8802c19d2..061ce358c 100644
--- a/application/loginwebpage.class.inc.php
+++ b/application/loginwebpage.class.inc.php
@@ -191,15 +191,10 @@ EOF
 			$sPreviousLoginMode = '';
 		}
 		// Unset all of the session variables.
-		$_SESSION = array();
+		unset($_SESSION['auth_user']);
+		unset($_SESSION['login_mode']);
 		// If it's desired to kill the session, also delete the session cookie.
 		// Note: This will destroy the session, and not just the session data!
-		if (isset($_COOKIE[session_name()]))
-		{
-			setcookie(session_name(), '', time()-3600, '/');
-		}		
-		// Finally, destroy the session.
-		session_destroy();
 	}
 
 	static function SecureConnectionRequired()
@@ -458,8 +453,6 @@ EOF
 	{
 		$sMessage  = ''; // In case we need to return a message to the calling web page
 		$operation = utils::ReadParam('loginop', '');
-		session_name(MetaModel::GetConfig()->Get('session_name'));
-		session_start();
 
 		if ($operation == 'logoff')
 		{
diff --git a/application/startup.inc.php b/application/startup.inc.php
index 9c71599b0..307b0cb5a 100644
--- a/application/startup.inc.php
+++ b/application/startup.inc.php
@@ -25,7 +25,16 @@
 
 require_once(APPROOT.'/core/cmdbobject.class.inc.php');
 require_once(APPROOT.'/application/utils.inc.php');
-
-MetaModel::Startup(ITOP_CONFIG_FILE);
+session_name('itop-'.md5(APPROOT));
+session_start();
+if (isset($_SESSION['itop_env']))
+{
+	$sConfigFile = $_SESSION['itop_env'];
+}
+else
+{
+	$sConfigFile = ITOP_CONFIG_FILE;
+}
+MetaModel::Startup($sConfigFile);
 
 ?>