diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..dff5f3a5d02a71dcf47f617135ac04564aa75973
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1 @@
+language: java
diff --git a/src/main/java/de/thm/arsnova/aop/UserSessionAspect.java b/src/main/java/de/thm/arsnova/aop/UserSessionAspect.java
index bede3b28acd1df08d2483e39f93cbf0c57e3b8d4..56f1158cd966511b8efb2b74a0b0cb3163ef079d 100644
--- a/src/main/java/de/thm/arsnova/aop/UserSessionAspect.java
+++ b/src/main/java/de/thm/arsnova/aop/UserSessionAspect.java
@@ -37,6 +37,7 @@ public class UserSessionAspect {
 	 * @param socketId
 	 * @param session
 	 */
+	/* FIXME This is not working because of scoping problems
 	@AfterReturning(
 		pointcut="execution(public * de.thm.arsnova.services.SessionService.joinSession(..)) && args(keyword, socketId)",
 		returning="session"
@@ -45,4 +46,5 @@ public class UserSessionAspect {
 		userSessionService.setSession(session);
 		userSessionService.setSocketId(socketId);
 	}
+	*/
 }
diff --git a/src/main/java/de/thm/arsnova/services/SessionService.java b/src/main/java/de/thm/arsnova/services/SessionService.java
index 75deeb1279c5d73bc1b661b6c97b770cc29c9ff7..88c5fe8212187d9f97c9af603a5df0d24081be11 100644
--- a/src/main/java/de/thm/arsnova/services/SessionService.java
+++ b/src/main/java/de/thm/arsnova/services/SessionService.java
@@ -64,7 +64,6 @@ public class SessionService implements ISessionService {
 	}
 
 	@Override
-	@Authenticated
 	public final Session joinSession(final String keyword, final UUID socketId) {
 		/* Socket.IO solution */
 
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);
 	}