diff --git a/application/logindefault.class.inc.php b/application/logindefault.class.inc.php
index 24b0ec24ef..85f8e46090 100644
--- a/application/logindefault.class.inc.php
+++ b/application/logindefault.class.inc.php
@@ -35,7 +35,7 @@ class LoginDefaultBefore extends AbstractLoginFSMExtension
 		if ($index !== false) {
 			// Force login mode
 			Session::Set('login_mode', $sProposedLoginMode);
-		} else {
+		} elseif (!Session::IsSet('login_mode')) {
 			Session::Unset('login_mode');
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;