Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java
===================================================================
diff -u -r3a68c970297a965f73cc4bda061a05c69a2818de -r50b55d4d73fdfb8db59637203baf8960c94e05d0
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java	(.../ILeaderselectionService.java)	(revision 3a68c970297a965f73cc4bda061a05c69a2818de)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java	(.../ILeaderselectionService.java)	(revision 50b55d4d73fdfb8db59637203baf8960c94e05d0)
@@ -24,13 +24,15 @@
 package org.lamsfoundation.lams.tool.leaderselection.service;
 
 import java.io.IOException;
+import java.util.Collection;
 import java.util.List;
 
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.leaderselection.model.Leaderselection;
 import org.lamsfoundation.lams.tool.leaderselection.model.LeaderselectionSession;
 import org.lamsfoundation.lams.tool.leaderselection.model.LeaderselectionUser;
 import org.lamsfoundation.lams.tool.service.ICommonToolService;
+import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 
 /**
@@ -46,6 +48,8 @@
      */
     List<LeaderselectionUser> getUsersBySession(Long toolSessionId);
 
+    Collection<User> getAllGroupUsers(Long toolSessionId);
+
     /**
      * Set specified user as a leader. Also the previous leader (if any) is marked as non-leader.
      *
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java
===================================================================
diff -u -r3a68c970297a965f73cc4bda061a05c69a2818de -r50b55d4d73fdfb8db59637203baf8960c94e05d0
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java	(.../LeaderselectionService.java)	(revision 3a68c970297a965f73cc4bda061a05c69a2818de)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java	(.../LeaderselectionService.java)	(revision 50b55d4d73fdfb8db59637203baf8960c94e05d0)
@@ -25,6 +25,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.SortedMap;
@@ -90,10 +91,6 @@
 
     private LeaderselectionOutputFactory leaderselectionOutputFactory;
 
-    public LeaderselectionService() {
-	super();
-    }
-
     /* ************ Methods from ToolSessionManager ************* */
     @Override
     public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException {
@@ -360,8 +357,13 @@
     public List<LeaderselectionUser> getUsersBySession(Long toolSessionId) {
 	return leaderselectionUserDAO.getBySessionId(toolSessionId);
     }
-
+    
     @Override
+    public Collection<User> getAllGroupUsers(Long toolSessionId) {
+	return toolService.getToolSession(toolSessionId).getLearners();
+    }
+    
+    @Override
     public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) {
 	return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry);
     }
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningController.java
===================================================================
diff -u -r8f2ea9ad369a3ffb1e3d087429357f8ddd2959ba -r50b55d4d73fdfb8db59637203baf8960c94e05d0
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningController.java	(.../LearningController.java)	(revision 8f2ea9ad369a3ffb1e3d087429357f8ddd2959ba)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningController.java	(.../LearningController.java)	(revision 50b55d4d73fdfb8db59637203baf8960c94e05d0)
@@ -24,7 +24,7 @@
 package org.lamsfoundation.lams.tool.leaderselection.web.controller;
 
 import java.io.IOException;
-import java.util.List;
+import java.util.Collection;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -38,6 +38,7 @@
 import org.lamsfoundation.lams.tool.leaderselection.service.ILeaderselectionService;
 import org.lamsfoundation.lams.tool.leaderselection.util.LeaderselectionConstants;
 import org.lamsfoundation.lams.tool.leaderselection.util.LeaderselectionException;
+import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -97,7 +98,7 @@
 
 	LeaderselectionUser groupLeader = session.getGroupLeader();
 	request.setAttribute(LeaderselectionConstants.ATTR_GROUP_LEADER, groupLeader);
-	List<LeaderselectionUser> groupUsers = leaderselectionService.getUsersBySession(toolSessionId);
+	Collection<User> groupUsers = leaderselectionService.getAllGroupUsers(toolSessionId);
 	request.setAttribute(LeaderselectionConstants.ATTR_GROUP_USERS, groupUsers);
 	request.setAttribute(LeaderselectionConstants.ATTR_TOOL_SESSION_ID, toolSessionId);