Index: lams_learning/web/gate/gateNext.jsp
===================================================================
diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -r54007f98ca71e0073f19c5db78536437123287c6
--- lams_learning/web/gate/gateNext.jsp	(.../gateNext.jsp)	(revision 1f7150d6142f994d113ba543736a9f7c0e154337)
+++ lams_learning/web/gate/gateNext.jsp	(.../gateNext.jsp)	(revision 54007f98ca71e0073f19c5db78536437123287c6)
@@ -1,20 +1,18 @@
-<c:set var="formAction"
-	value="/gate/knockGate.do?activityID=${GateForm.map.activityID}&lessonID=${GateForm.map.lessonID }" />
-<c:if test="${GateForm.map.monitorCanOpenGate}">
+<c:set var="formAction" value="knockGate.do?activityID=${gateForm.activityID}&lessonID=${gateForm.lessonID }" />
+<c:if test="${gateForm.monitorCanOpenGate}">
 	<div class="voffset5">
 		<fmt:message key="label.gate.refresh.message" />
 	</div>
 </c:if>
 
-<c:if test="${GateForm.map.previewLesson == true}">
+<c:if test="${gateForm.previewLesson == true}">
 	<div class="voffset5">
-		<c:set var="formAction">
-			<c:out value="${formAction}" />&force=true</c:set>
+		<c:set var="formAction" value="${formAction}&force=true"/>
 		<em><fmt:message key="label.gate.preview.message" /></em>
 	</div>
 </c:if>
 
-<form:form action="${formAction}" modelAttribute="GateForm" target="_self">
+<form:form action="${formAction}" modelAttribute="gateForm" target="_self">
 	<div class="voffset10 pull-right">
 		<button class="btn btn-default">
 			<fmt:message key="label.next.button" />