Index: lams_tool_chat/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -r395383498aa7d3ef716883f2b53816eee8b356f6 -r77be85501a11ea370c5e2432374ac6dbb7d4410f
--- lams_tool_chat/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 395383498aa7d3ef716883f2b53816eee8b356f6)
+++ lams_tool_chat/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 77be85501a11ea370c5e2432374ac6dbb7d4410f)
@@ -1,33 +1,34 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:choose>
-	<c:when test="${!chatUserDTO.finishedActivity}">
-		<html:form action="/learning" method="post">
-			<c:set var="dispatch" value="finishActivity" />
-			<c:set var="buttonLabel" value="button.finish" />
-			<c:if test="${chatDTO.reflectOnActivity}">
-				<c:set var="dispatch" value="openNotebook" />
-				<c:set var="buttonLabel" value="button.reflect" />
-			</c:if>
-			<html:hidden property="dispatch" value="${dispatch}" />
-			<html:hidden property="chatUserUID" value="${chatUserDTO.uid}" />
+<c:if
+	test="${chatUserDTO.finishedActivity and chatDTO.reflectOnActivity}">
+	<div>
+		<h4 style="margin-left: 12px;">
+			${chatDTO.reflectInstructions}
+		</h4>
+		<p>
+			${chatUserDTO.notebookEntry}
+		</p>
+	</div>
+</c:if>
+
+<html:form action="/learning" method="post">
+	<html:hidden property="chatUserUID" value="${chatUserDTO.uid}" />
+	<c:choose>
+		<c:when
+			test="${!chatUserDTO.finishedActivity and chatDTO.reflectOnActivity}">
+			<html:hidden property="dispatch" value="openNotebook" />
+
 			<html:submit styleClass="button right-buttons">
-				<fmt:message>${buttonLabel}</fmt:message>
+				<fmt:message key="button.continue" />
 			</html:submit>
-		</html:form>
-		<br />
-	</c:when>
 
-	<c:otherwise>
-		<c:if test="${chatDTO.reflectOnActivity }">
-			<div>
-				<h4 style="margin-left: 12px;">
-					<lams:out value="${chatDTO.reflectInstructions}"/>
-				</h4>
-				<p>
-					<lams:out value="${chatUserDTO.notebookEntry}"/>
-				</p>
-			</div>
-		</c:if>
-	</c:otherwise>
-</c:choose>
+		</c:when>
+		<c:otherwise>
+			<html:hidden property="dispatch" value="finishActivity" />
+			<html:submit styleClass="button right-buttons">
+				<fmt:message key="button.finish" />
+			</html:submit>
+		</c:otherwise>
+	</c:choose>
+</html:form>
Index: lams_tool_scribe/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -r0697c7a71301d7d5d468f4051de6761cf5904606 -r77be85501a11ea370c5e2432374ac6dbb7d4410f
--- lams_tool_scribe/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 0697c7a71301d7d5d468f4051de6761cf5904606)
+++ lams_tool_scribe/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 77be85501a11ea370c5e2432374ac6dbb7d4410f)
@@ -1,33 +1,34 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:choose>
-	<c:when test="${!scribeUserDTO.finishedActivity}">
-		<html:form action="/learning" method="post">
-			<c:set var="dispatch" value="finishActivity" />
-			<c:set var="buttonLabel" value="button.finish" />
-			<c:if test="${scribeDTO.reflectOnActivity}">
-				<c:set var="dispatch" value="openNotebook" />
-				<c:set var="buttonLabel" value="button.continue" />
-			</c:if>
-			<html:hidden property="dispatch" value="${dispatch}" />
-			<html:hidden property="scribeUserUID" value="${scribeUserDTO.uid}" />
+<c:if
+	test="${scribeUserDTO.finishedActivity and scribeDTO.reflectOnActivity}">
+	<div>
+		<h4 style="margin-left: 12px;">
+			${scribeDTO.reflectInstructions}
+		</h4>
+		<p>
+			${scribeUserDTO.notebookEntry}
+		</p>
+	</div>
+</c:if>
+
+<html:form action="/learning" method="post">
+	<html:hidden property="scribeUserUID" value="${scribeUserDTO.uid}" />
+	<c:choose>
+		<c:when
+			test="${!scribeUserDTO.finishedActivity and scribeDTO.reflectOnActivity}">
+			<html:hidden property="dispatch" value="openNotebook" />
+
 			<html:submit styleClass="button right-buttons">
-				<fmt:message>${buttonLabel}</fmt:message>
+				<fmt:message key="button.continue" />
 			</html:submit>
-		</html:form>
-		<br />
-	</c:when>
 
-	<c:otherwise>
-		<c:if test="${scribeDTO.reflectOnActivity }">
-			<div>
-				<h4 style="margin-left: 12px;">
-					${scribeDTO.reflectInstructions}
-				</h4>
-				<p>
-					${scribeUserDTO.notebookEntry}
-				</p>
-			</div>
-		</c:if>
-	</c:otherwise>
-</c:choose>
+		</c:when>
+		<c:otherwise>
+			<html:hidden property="dispatch" value="finishActivity" />
+			<html:submit styleClass="button right-buttons">
+				<fmt:message key="button.finish" />
+			</html:submit>
+		</c:otherwise>
+	</c:choose>
+</html:form>
\ No newline at end of file