diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index bad940def6d0c25f58284199b88b0b0b900c9b85..d1496a0b7cafe615177f2ecf842fd46316c223b8 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -1355,17 +1355,6 @@ public class CouchDBDao implements IDatabaseDao {
 		}
 	}
 	
-	@Override
-	public String getCourseId(String keyword) {
-		return this.getSession(keyword).getCourseId();
-	}
-	
-	@Override
-	public boolean isCourseSession(String keyword) {
-		return (this.getSession(keyword).getCourseId() != null) &&
-				(this.getSession(keyword).getCourseType() != null);
-	}
-	
 	@Override
 	public List<Session> getCourseSessions(List<Course> courses) {
 		ExtendedView view = new ExtendedView("logged_in/available_moodlesessions");
diff --git a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
index b4201ee2ad2535ea3e86bb019923531396d37821..1968ce84b3d0351a59075ed94e183d42defda7d7 100644
--- a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
+++ b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
@@ -130,9 +130,5 @@ public interface IDatabaseDao {
 
 	void deleteInterposedQuestion(InterposedQuestion question);
 
-	String getCourseId(String keyword);
-
-	boolean isCourseSession(String keyword);
-
 	List<Session> getCourseSessions(List<Course> courses);
 }
diff --git a/src/main/java/de/thm/arsnova/entities/Session.java b/src/main/java/de/thm/arsnova/entities/Session.java
index 5eece57b21073cc6e9d06daadc8a4eb076a681b6..0ed482306d7cc4aba122d9eeee2fcee674e87bbf 100644
--- a/src/main/java/de/thm/arsnova/entities/Session.java
+++ b/src/main/java/de/thm/arsnova/entities/Session.java
@@ -124,4 +124,8 @@ public class Session {
 	public void setCourseId(String courseId) {
 		this.courseId = courseId;
 	}
+
+	public boolean isCourseSession() {
+		return (this.getCourseId() != null) && (!this.getCourseId().isEmpty());
+	}
 }
diff --git a/src/main/java/de/thm/arsnova/services/SessionService.java b/src/main/java/de/thm/arsnova/services/SessionService.java
index 7a1b6538c60f8285ed57856bfe66ed8abf9c9e6f..39525032bd643d0bf0de85296308a805954687f9 100644
--- a/src/main/java/de/thm/arsnova/services/SessionService.java
+++ b/src/main/java/de/thm/arsnova/services/SessionService.java
@@ -58,8 +58,8 @@ public class SessionService implements ISessionService {
 	public final Session joinSession(final String keyword) {
 		Session session = databaseDao.getSession(keyword);
 		
-		if (connectorClient != null && databaseDao.isCourseSession(keyword)) {
-			String courseid = databaseDao.getCourseId(keyword);
+		if (connectorClient != null && session.isCourseSession()) {
+			String courseid = session.getCourseId();
 			if (! connectorClient.getMembership(userService.getCurrentUser().getUsername(), courseid).isMember()) {
 				throw new ForbiddenException();
 			}
diff --git a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
index 5e7f86480c98c9f5bb5331da87d68e52388413c1..be578dbeba69905260d6f0ddf2b977081ac4204f 100644
--- a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
+++ b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
@@ -393,11 +393,6 @@ public class StubDatabaseDao implements IDatabaseDao {
 		return null;
 	}
 
-	public String getCourseId(String keyword) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
 	@Override
 	public Answer updateAnswer(Answer answer) {
 		// TODO Auto-generated method stub
@@ -420,11 +415,6 @@ public class StubDatabaseDao implements IDatabaseDao {
 		// TODO Auto-generated method stub
 	}
 	
-	public boolean isCourseSession(String keyword) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-	
 	@Override
 	public List<Session> getCourseSessions(List<Course> courses) {
 		return null;