diff --git a/src/main/java/de/thm/arsnova/services/SessionService.java b/src/main/java/de/thm/arsnova/services/SessionService.java
index 698c812183c0f3eb18137e55cf6b055b70a9f28c..b7b936bf265ec5d94184cfcedb3e8cd74dec95f2 100644
--- a/src/main/java/de/thm/arsnova/services/SessionService.java
+++ b/src/main/java/de/thm/arsnova/services/SessionService.java
@@ -59,6 +59,7 @@ public class SessionService implements ISessionService {
 	@Override
 	@Authenticated
 	public final Session joinSession(final String keyword) {
+		userService.addCurrentUserToSessionMap(keyword);
 		Session session = databaseDao.getSession(keyword);
 		
 		if (connectorClient != null && session.isCourseSession()) {