Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java,v
diff -u -r1.14 -r1.15
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	9 Apr 2013 12:47:36 -0000	1.14
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	19 Apr 2013 13:26:41 -0000	1.15
@@ -172,9 +172,9 @@
 	
 	// get notebook entry
 	String entryText = new String();
-	if (user != null) {
+	if (groupLeader != null) {
 	    NotebookEntry notebookEntry = service.getEntry(toolSessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
-		    ScratchieConstants.TOOL_SIGNATURE, user.getUserId().intValue());
+		    ScratchieConstants.TOOL_SIGNATURE, groupLeader.getUserId().intValue());
 	    if (notebookEntry != null) {
 		entryText = notebookEntry.getEntry();
 	    }
Index: lams_tool_scratchie/web/pages/learning/questionlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/learning/questionlist.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_scratchie/web/pages/learning/questionlist.jsp	9 Apr 2013 12:47:36 -0000	1.4
+++ lams_tool_scratchie/web/pages/learning/questionlist.jsp	19 Apr 2013 13:26:41 -0000	1.5
@@ -75,7 +75,7 @@
 					</c:otherwise>
 				</c:choose>
 
-				<c:if test="${(mode != 'teacher') && (isUserLeader || isScratchingFinished)}">
+				<c:if test="${(mode != 'teacher') && isUserLeader}">
 					<html:button property="finishButton" onclick="return continueReflect()" styleClass="button">
 						<fmt:message key="label.edit" />
 					</html:button>
@@ -86,7 +86,7 @@
 		<c:if test="${(mode != 'teacher') &&  (isUserLeader || isScratchingFinished)}">
 			<div class="space-bottom-top align-right">
 				<c:choose>
-					<c:when test="${sessionMap.reflectOn && !sessionMap.userFinished and !sessionMap.isShowResultsPage}">
+					<c:when test="${sessionMap.reflectOn && !sessionMap.userFinished && !sessionMap.isShowResultsPage && isUserLeader}">
 						<html:button property="finishButton" styleId="finishButton" onclick="return continueReflect()" styleClass="button">
 							<fmt:message key="label.continue" />
 						</html:button>
Index: lams_tool_scratchie/web/pages/learning/results.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/learning/results.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_scratchie/web/pages/learning/results.jsp	9 Apr 2013 12:47:36 -0000	1.3
+++ lams_tool_scratchie/web/pages/learning/results.jsp	19 Apr 2013 13:26:41 -0000	1.4
@@ -10,6 +10,7 @@
 	<c:set var="mode" value="${sessionMap.mode}" />
 	<c:set var="toolSessionID" value="${sessionMap.toolSessionID}" />
 	<c:set var="scratchie" value="${sessionMap.scratchie}" />
+	<c:set var="isUserLeader" value="${sessionMap.user.leader}" />
 
 <lams:html>
 <lams:head>
@@ -73,7 +74,7 @@
 		</c:forEach>
 
 
-		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
+		<c:if test="${sessionMap.userFinished && sessionMap.reflectOn}">
 			<div class="small-space-top">
 				<h2>
 					${sessionMap.reflectInstructions}
@@ -93,7 +94,7 @@
 					</c:otherwise>
 				</c:choose>
 
-				<c:if test="${mode != 'teacher'}">
+				<c:if test="${(mode != 'teacher') && isUserLeader}">
 					<html:button property="finishButton" onclick="return continueReflect()" styleClass="button">
 						<fmt:message key="label.edit" />
 					</html:button>
@@ -104,7 +105,7 @@
 		<c:if test="${mode != 'teacher'}">
 			<div class="space-bottom-top align-right">
 				<c:choose>
-					<c:when test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
+					<c:when test="${sessionMap.reflectOn && (not sessionMap.userFinished) && isUserLeader}">
 						<html:button property="finishButton" styleId="finishButton" onclick="return continueReflect()" styleClass="button">
 							<fmt:message key="label.continue" />
 						</html:button>