diff --git a/t3lib/class.t3lib_userauth.php b/t3lib/class.t3lib_userauth.php
index 712baf64ac8b..af560253a6c2 100644
--- a/t3lib/class.t3lib_userauth.php
+++ b/t3lib/class.t3lib_userauth.php
@@ -252,6 +252,9 @@ function start() {
 			// Make certain that NO user is set initially
 		$this->user = '';
 
+			// We need a PHP session session for most login levels
+		session_start();
+
 			// Check to see if anyone has submitted login-information and if so register the user with the session. $this->user[uid] may be used to write log...
 		$this->checkAuthentication();
 
@@ -1299,7 +1302,6 @@ function compareUident($user, $loginData, $security_level = '') {
 
 					// Check challenge stored in cookie:
 				if ($this->challengeStoredInCookie) {
-					session_start();
 					if ($_SESSION['login_challenge'] !== $loginData['chalvalue']) {
 						if ($this->writeDevLog) {
 							t3lib_div::devLog('PHP Session stored challenge "' . $_SESSION['login_challenge'] . '" and submitted challenge "' . $loginData['chalvalue'] . '" did not match, so authentication failed!', 't3lib_userAuth', 2);
diff --git a/typo3/sysext/workspaces b/typo3/sysext/workspaces
index 37d88239ebad..0310d436b775 160000
--- a/typo3/sysext/workspaces
+++ b/typo3/sysext/workspaces
@@ -1 +1 @@
-Subproject commit 37d88239ebad97827bf617fc61fe872cb42fe3a0
+Subproject commit 0310d436b775143e18332e8a9ae0c698662f34f5