Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java,v
diff -u -r1.20 -r1.21
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	8 Oct 2013 11:46:10 -0000	1.20
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	8 Oct 2013 18:01:37 -0000	1.21
@@ -338,12 +338,12 @@
     boolean isGroupedActivity(long toolContentID);
     
     /**
-     * Return all learners in activity
+     * Return all leaders in activity for all groups
      * 
      * @param contentId
      * @return
      */
-    Set<ScratchieUser> getAllLearners(Long contentId);
+    Set<ScratchieUser> getAllLeaders(Long contentId);
     
     void changeUserMark(Long userId, Long userUid, Integer newMark);
 }
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java,v
diff -u -r1.28 -r1.29
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	6 Oct 2013 12:56:13 -0000	1.28
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	8 Oct 2013 18:01:37 -0000	1.29
@@ -605,18 +605,19 @@
     }
 
     @Override
-    public Set<ScratchieUser> getAllLearners(Long contentId) {
+    public Set<ScratchieUser> getAllLeaders(Long contentId) {
 
-	Set<ScratchieUser> users = new TreeSet<ScratchieUser>();
+	Set<ScratchieUser> leaders = new TreeSet<ScratchieUser>();
 
 	List<ScratchieSession> sessionList = scratchieSessionDao.getByContentId(contentId);
 	for (ScratchieSession session : sessionList) {
-	    Long sessionId = session.getSessionId();
-	    List<ScratchieUser> sessionUsers = scratchieUserDao.getBySessionID(sessionId);
-	    users.addAll(sessionUsers);
+	    ScratchieUser leader = session.getGroupLeader();
+	    if (leader != null) {
+		leaders.add(leader);
+	    }
 	}
 
-	return users;
+	return leaders;
     }
 
     @Override
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java,v
diff -u -r1.17 -r1.18
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java	8 Oct 2013 11:46:09 -0000	1.17
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java	8 Oct 2013 18:01:37 -0000	1.18
@@ -109,7 +109,7 @@
 
 	Scratchie scratchie = service.getScratchieByContentId(contentId);
 	scratchie.toDTO();
-	Set<ScratchieUser> learners = service.getAllLearners(contentId);
+	Set<ScratchieUser> learners = service.getAllLeaders(contentId);
 	
 	//set SubmissionDeadline, if any
 	if (scratchie.getSubmissionDeadline() != null) {
Index: lams_tool_scratchie/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/monitoring/summary.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_scratchie/web/pages/monitoring/summary.jsp	8 Oct 2013 11:46:09 -0000	1.11
+++ lams_tool_scratchie/web/pages/monitoring/summary.jsp	8 Oct 2013 18:01:37 -0000	1.12
@@ -259,7 +259,7 @@
 			<select id="userid-dropdown" class="float-left">
 				<option selected="selected" value="-1"><fmt:message key="label.monitoring.summary.choose" /></option>
     			<c:forEach var="learner" items="${sessionMap.learners}">
-					<option value="${learner.userId}" alt="${learner.session.sessionId}">${learner.firstName} ${learner.lastName}</option>
+					<option value="${learner.userId}" alt="${learner.session.sessionId}">${learner.firstName} ${learner.lastName} (${learner.session.sessionName})</option>
 			   	</c:forEach>
 			</select>
 		</div>