diff --git a/src/main/java/de/thm/arsnova/controller/LoginController.java b/src/main/java/de/thm/arsnova/controller/LoginController.java
index 5cb0def15fba1a5cdf6b73aa0784ef8bd3fb84f6..37a47167a39b5877aa33d110afc69f13c65a7b19 100644
--- a/src/main/java/de/thm/arsnova/controller/LoginController.java
+++ b/src/main/java/de/thm/arsnova/controller/LoginController.java
@@ -146,15 +146,14 @@ public class LoginController extends AbstractController {
 					SecurityContextHolder.getContext());
 			result = new RedirectView(null == successUrl ? referer + "#auth/checkLogin" : successUrl);
 		}
-		
-		userSessionService.setUser(userService.getCurrentUser());
-		
+				
 		return result;
 	}
 
 	@RequestMapping(value = { "/auth/", "/whoami" }, method = RequestMethod.GET)
 	@ResponseBody
 	public final User whoami() {
+		userSessionService.setUser(userService.getCurrentUser());		
 		return userService.getCurrentUser();
 	}