diff --git a/application/loginwebpage.class.inc.php b/application/loginwebpage.class.inc.php
index 8c7aa5105..9f0735784 100644
--- a/application/loginwebpage.class.inc.php
+++ b/application/loginwebpage.class.inc.php
@@ -483,6 +483,7 @@ class LoginWebPage extends NiceWebPage
 					$iResponse = $oLoginFSMExtensionInstance->LoginAction($sLoginState, $iErrorCode);
 					if ($iResponse == self::LOGIN_FSM_RETURN)
 					{
+						Session::WriteClose();
 						return $iErrorCode; // Asked to exit FSM, generally login OK
 					}
 					if ($iResponse == self::LOGIN_FSM_ERROR)
diff --git a/application/startup.inc.php b/application/startup.inc.php
index 9b3a2e8fe..95a3a59d2 100644
--- a/application/startup.inc.php
+++ b/application/startup.inc.php
@@ -66,7 +66,6 @@ register_shutdown_function(function()
 });
 $oKPI = new ExecutionKPI();
 Session::Start();
-Session::WriteClose();
 $oKPI->ComputeAndReport("Session Start");
 
 $sSwitchEnv = utils::ReadParam('switch_env', null);