diff --git a/src/main/java/de/thm/arsnova/services/UserService.java b/src/main/java/de/thm/arsnova/services/UserService.java
index 23494da815e2bff274bdc3c52fb22b8bffbebbf0..99521ec7530b50d628bd9b9555633967da72b3f4 100644
--- a/src/main/java/de/thm/arsnova/services/UserService.java
+++ b/src/main/java/de/thm/arsnova/services/UserService.java
@@ -142,8 +142,12 @@ public class UserService implements IUserService {
 		}
 		String session = user2sessionLegacy.get(user);
 		if (session == null) {
-			return false;
+			session = user2session.get(user);
+			if (session == null) {
+				return false;
+			}
 		}
+
 		return keyword.equals(session);
 	}