diff --git a/src/main/java/org/olat/shibboleth/ShibbolethDispatcher.java b/src/main/java/org/olat/shibboleth/ShibbolethDispatcher.java
index e1d2b29f7f78e07a5be4b82664a99919f4218d8d..b9a3c77391de8bfc14ed7d1e4f52099c91700bff 100644
--- a/src/main/java/org/olat/shibboleth/ShibbolethDispatcher.java
+++ b/src/main/java/org/olat/shibboleth/ShibbolethDispatcher.java
@@ -175,6 +175,7 @@ public class ShibbolethDispatcher implements Dispatcher{
 			ThreadLocalUserActivityLoggerInstaller.initUserActivityLogger(req);
 		}
 		int loginStatus = AuthHelper.doLogin(auth.getIdentity(), ShibbolethDispatcher.PROVIDER_SHIB, ureq);
+		ureq.getUserSession().setAuthenticated(false);
 		if (loginStatus != AuthHelper.LOGIN_OK) {
 			if (loginStatus == AuthHelper.LOGIN_NOTAVAILABLE) {
 				DispatcherModule.redirectToServiceNotAvailable(resp);
@@ -192,6 +193,7 @@ public class ShibbolethDispatcher implements Dispatcher{
 			if (CoreSpringFactory.getImpl(RegistrationManager.class).needsToConfirmDisclaimer(authenticationedIdentity)) {
 				disclaimer(resp);
 			} else {
+				ureq.getUserSession().setAuthenticated(true);
 				MediaResource mr = ureq.getDispatchResult().getResultingMediaResource();
 				if (mr instanceof RedirectMediaResource) {
 					RedirectMediaResource rmr = (RedirectMediaResource)mr;