Index: lams_admin/web/config/editconfig.jsp
===================================================================
diff -u -r1ef1213820fe7ff7c6f4a9238b3f489a25012c63 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_admin/web/config/editconfig.jsp	(.../editconfig.jsp)	(revision 1ef1213820fe7ff7c6f4a9238b3f489a25012c63)
+++ lams_admin/web/config/editconfig.jsp	(.../editconfig.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -27,7 +27,7 @@
 				<c:out value="${error}" />
 			</lams:Alert>
 		</c:if>
-		<form:form action="config/save.do?${csrfToken}" modelAttribute="configForm" id="configForm" method="post">
+		<form:form action="config/save.do" modelAttribute="configForm" id="configForm" method="post">
 			<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 				
 			<c:forEach items="${config}" var="group">
Index: lams_admin/web/integration/ltiConsumer.jsp
===================================================================
diff -u -r1ef1213820fe7ff7c6f4a9238b3f489a25012c63 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_admin/web/integration/ltiConsumer.jsp	(.../ltiConsumer.jsp)	(revision 1ef1213820fe7ff7c6f4a9238b3f489a25012c63)
+++ lams_admin/web/integration/ltiConsumer.jsp	(.../ltiConsumer.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -53,7 +53,7 @@
 		</p>
 					
 		<lams:errors path="*"/>
-		<form:form action="save.do?${csrfToken}" id="ltiConsumerForm" modelAttribute="ltiConsumerForm" method="post">
+		<form:form action="save.do" id="ltiConsumerForm" modelAttribute="ltiConsumerForm" method="post">
 			<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 			<form:hidden path="sid" />
 						
Index: lams_admin/web/integration/servermaintain.jsp
===================================================================
diff -u -r1ef1213820fe7ff7c6f4a9238b3f489a25012c63 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_admin/web/integration/servermaintain.jsp	(.../servermaintain.jsp)	(revision 1ef1213820fe7ff7c6f4a9238b3f489a25012c63)
+++ lams_admin/web/integration/servermaintain.jsp	(.../servermaintain.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -71,7 +71,7 @@
 	</p>
 	
 	<lams:errors/>
-    <form:form action="serversave.do?${csrfToken}" id="extServerForm" modelAttribute="extServerForm" method="post">
+    <form:form action="serversave.do" id="extServerForm" modelAttribute="extServerForm" method="post">
 		<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 		<form:hidden path="sid" />
 		
Index: lams_admin/web/loginmaintain.jsp
===================================================================
diff -u -r1ef1213820fe7ff7c6f4a9238b3f489a25012c63 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_admin/web/loginmaintain.jsp	(.../loginmaintain.jsp)	(revision 1ef1213820fe7ff7c6f4a9238b3f489a25012c63)
+++ lams_admin/web/loginmaintain.jsp	(.../loginmaintain.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -21,7 +21,7 @@
 				<fmt:message key="sysadmin.maintain" />
 			</a>
 		</p>
-		<form:form action="./loginsave.do?${csrfToken}" modelAttribute="loginMaintainForm" id="loginMaintainForm" enctype="multipart/form-data" method="post">
+		<form:form action="./loginsave.do" modelAttribute="loginMaintainForm" id="loginMaintainForm" enctype="multipart/form-data" method="post">
 			<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 			<c:set var="language"><lams:user property="localeLanguage"/></c:set>
 			<p class="help-block"><fmt:message key="sysadmin.login.text"/></p>
Index: lams_admin/web/policies/editPolicy.jsp
===================================================================
diff -u -r1ef1213820fe7ff7c6f4a9238b3f489a25012c63 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_admin/web/policies/editPolicy.jsp	(.../editPolicy.jsp)	(revision 1ef1213820fe7ff7c6f4a9238b3f489a25012c63)
+++ lams_admin/web/policies/editPolicy.jsp	(.../editPolicy.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -70,7 +70,7 @@
 				<fmt:message key="admin.policies.title" />
 			</a>
 		</div>
-    <form:form action="../policyManagement/save.do?${csrfToken}" modelAttribute="policyForm" id="policy-form" cssClass="voffset20" method="post">
+    <form:form action="../policyManagement/save.do" modelAttribute="policyForm" id="policy-form" cssClass="voffset20" method="post">
 		<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 			<form:hidden path="policyUid" />
 			<form:hidden path="policyId" />
Index: lams_admin/web/signupmanagement/add.jsp
===================================================================
diff -u -r1ef1213820fe7ff7c6f4a9238b3f489a25012c63 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_admin/web/signupmanagement/add.jsp	(.../add.jsp)	(revision 1ef1213820fe7ff7c6f4a9238b3f489a25012c63)
+++ lams_admin/web/signupmanagement/add.jsp	(.../add.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -20,7 +20,7 @@
 			<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a>
 			<a href="<lams:LAMSURL/>admin/signupManagement/start.do" class="btn btn-default loffset5"><fmt:message key="admin.signup.title" /></a>
 		</div>
-		<form:form action="add.do?${csrfToken}" modelAttribute="signupForm" id="signupForm" method="post">
+		<form:form action="add.do" modelAttribute="signupForm" id="signupForm" method="post">
 			<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 				<form:hidden path="signupOrganisationId" />
 				
Index: lams_admin/web/themeManagement.jsp
===================================================================
diff -u -r1ef1213820fe7ff7c6f4a9238b3f489a25012c63 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_admin/web/themeManagement.jsp	(.../themeManagement.jsp)	(revision 1ef1213820fe7ff7c6f4a9238b3f489a25012c63)
+++ lams_admin/web/themeManagement.jsp	(.../themeManagement.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -149,7 +149,7 @@
 				</div>
 				
 				<div class="panel-body">
-				<form:form action="addOrEditTheme.do?${csrfToken}" method="post" modelAttribute="themeForm" id="themeForm">	
+				<form:form action="addOrEditTheme.do" method="post" modelAttribute="themeForm" id="themeForm">	
 				<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 				<form:hidden path="id" id="id" />
 				
Index: lams_admin/web/timezoneManagement.jsp
===================================================================
diff -u -r1ef1213820fe7ff7c6f4a9238b3f489a25012c63 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_admin/web/timezoneManagement.jsp	(.../timezoneManagement.jsp)	(revision 1ef1213820fe7ff7c6f4a9238b3f489a25012c63)
+++ lams_admin/web/timezoneManagement.jsp	(.../timezoneManagement.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -49,7 +49,7 @@
 			</fmt:message>
 			
 			<lams:errors/>
-        <form:form action="save.do?${csrfToken}" id="timezoneForm" modelAttribute="timezoneForm" method="post">
+        <form:form action="save.do" id="timezoneForm" modelAttribute="timezoneForm" method="post">
 			<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 				
 				<table class="table table-striped table-condensed">
Index: lams_central/web/outcome/outcomeEdit.jsp
===================================================================
diff -u -rae4e7fd3d6b21cb7f41a733565442950cdd9d232 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_central/web/outcome/outcomeEdit.jsp	(.../outcomeEdit.jsp)	(revision ae4e7fd3d6b21cb7f41a733565442950cdd9d232)
+++ lams_central/web/outcome/outcomeEdit.jsp	(.../outcomeEdit.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -42,8 +42,8 @@
 	</script>
 </lams:head>
 <body>
-<c:set var="csrfToken"><csrf:token/></c:set>
-<form:form action="outcomeSave.do?${csrfToken}" method="post" modelAttribute="outcomeForm">
+<form:form action="outcomeSave.do" method="post" modelAttribute="outcomeForm">
+	<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 	<c:set var="formDisabled" value="${not empty outcomeForm.outcomeId and empty outcomeForm.organisationId and not canManageGlobal}" />
 
 	<form:hidden path="outcomeId" />
Index: lams_central/web/profile/editprofile.jsp
===================================================================
diff -u -rae4e7fd3d6b21cb7f41a733565442950cdd9d232 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_central/web/profile/editprofile.jsp	(.../editprofile.jsp)	(revision ae4e7fd3d6b21cb7f41a733565442950cdd9d232)
+++ lams_central/web/profile/editprofile.jsp	(.../editprofile.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -39,8 +39,8 @@
 </lams:head>
 
 <body>
-	<c:set var="csrfToken"><csrf:token/></c:set>
-	<form:form action="/lams/saveprofile.do?${csrfToken}" modelAttribute='newForm' method="post" id='newForm'>
+	<form:form action="/lams/saveprofile.do" modelAttribute='newForm' method="post" id='newForm'>
+		<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 		<input type="hidden" name="editNameOnly" value="${editOnlyName}" />
 
 		<lams:errors path="*"/>
@@ -357,4 +357,4 @@
 		</div>
 	</form:form>
 </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_assessment/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_assessment/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 845b503553ad948cb5db7b89950f7c5251ada5d7)
+++ lams_tool_assessment/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -47,9 +47,9 @@
     </script>
 </lams:head>
 <body class="stripes" onLoad="init()">
-	<c:set var="csrfToken"><csrf:token/></c:set>
-	<form:form action="updateContent.do?${csrfToken}" method="post" modelAttribute="assessmentForm" id="authoringForm" enctype="multipart/form-data"
+	<form:form action="updateContent.do" method="post" modelAttribute="assessmentForm" id="authoringForm" enctype="multipart/form-data"
 			onsubmit="return validateQuestionBankIsNotEmpty();">
+		<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 	
 		<c:set var="title"><fmt:message key="label.author.title" /></c:set>
 		<lams:Page title="${title}" type="navbar">
Index: lams_tool_chat/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_chat/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 845b503553ad948cb5db7b89950f7c5251ada5d7)
+++ lams_tool_chat/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -17,8 +17,8 @@
 	</lams:head>
 	
 	<body class="stripes" onload="init();">
-		<c:set var="csrfToken"><csrf:token/></c:set>
-		<form:form action="updateContent.do?${csrfToken}" modelAttribute="authoringForm" id="authoringForm" method="post" enctype="multipart/form-data">
+		<form:form action="updateContent.do" modelAttribute="authoringForm" id="authoringForm" method="post" enctype="multipart/form-data">
+		<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 
 		<c:set var="sessionMap" value="${sessionScope[authoringForm.sessionMapID]}" />
 	
Index: lams_tool_daco/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_daco/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 845b503553ad948cb5db7b89950f7c5251ada5d7)
+++ lams_tool_daco/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -28,8 +28,8 @@
  
 </lams:head>
 <body class="stripes" onLoad="init()">
-<c:set var="csrfToken"><csrf:token/></c:set>
-<form:form action="update.do?${csrfToken}" modelAttribute="authoringForm" method="post" id="authoringForm" enctype="multipart/form-data">
+<form:form action="update.do" modelAttribute="authoringForm" method="post" id="authoringForm" enctype="multipart/form-data">
+	<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 
 	<c:set var="title"><fmt:message key="label.common.heading" /></c:set>
 	<lams:Page title="${title}" type="navbar">
@@ -75,4 +75,4 @@
 </form:form>
 
 </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_doku/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_doku/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 845b503553ad948cb5db7b89950f7c5251ada5d7)
+++ lams_tool_doku/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -28,8 +28,8 @@
 </lams:head>
 
 <body class="stripes" onLoad="init()">
-<c:set var="csrfToken"><csrf:token/></c:set>
-<form:form action="update.do?${csrfToken}" modelAttribute="authoringForm" method="post" id="authoringForm" enctype="multipart/form-data">
+<form:form action="update.do" modelAttribute="authoringForm" method="post" id="authoringForm" enctype="multipart/form-data">
+	<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 	<form:hidden path="dokumaran.contentId" />
 	<form:hidden path="mode" value="${mode}"/>
 	<form:hidden path="sessionMapID" />
Index: lams_tool_forum/web/jsps/authoring/authoring.jsp
===================================================================
diff -u -r2eb3170d6501ff5206577dcaa8881209033c1f49 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision 2eb3170d6501ff5206577dcaa8881209033c1f49)
+++ lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -36,8 +36,8 @@
 
 	<body class="stripes" onLoad="init()">
 	
-		<c:set var="csrfToken"><csrf:token/></c:set>
-		<form:form action="update.do?${csrfToken}" method="post" id="forumForm" modelAttribute="forumForm" enctype="multipart/form-data">
+		<form:form action="update.do" method="post" id="forumForm" modelAttribute="forumForm" enctype="multipart/form-data">
+			<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 			<form:hidden path="toolContentID" />
 			<form:hidden path="sessionMapID" />
 			<form:hidden path="contentFolderID" />
Index: lams_tool_forum/web/jsps/monitoring/updatemarks.jsp
===================================================================
diff -u -r6116054d29807ae2c1f274fc324a507c2b3a0910 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	(.../updatemarks.jsp)	(revision 6116054d29807ae2c1f274fc324a507c2b3a0910)
+++ lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	(.../updatemarks.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -11,9 +11,9 @@
 	<body class="stripes">
 			
 			<lams:Page type="monitor" title="${page.title.monitoring.edit.user.mark}">
-            <c:set var="csrfToken"><csrf:token/></c:set>
 
-			<form:form action="updateMark.do?${csrfToken}" id="markForm" modelAttribute="markForm" method="post">
+			<form:form action="updateMark.do" id="markForm" modelAttribute="markForm" method="post">
+			<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 
 			<c:set var="sessionMap" value="${sessionScope[markForm.sessionMapID]}" />
 			<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
Index: lams_tool_images/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_images/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 845b503553ad948cb5db7b89950f7c5251ada5d7)
+++ lams_tool_images/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -51,9 +51,8 @@
 </lams:head>
 
 <body class="stripes" onLoad="init();">
-	<c:set var="csrfToken"><csrf:token/></c:set>
-	<form:form action="update.do?${csrfToken}" method="post" modelAttribute="imageGalleryForm" id="imageGalleryForm" enctype="multipart/form-data">
-	
+	<form:form action="update.do" method="post" modelAttribute="imageGalleryForm" id="imageGalleryForm" enctype="multipart/form-data">
+		<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 		<c:set var="title"><fmt:message key="label.learning.heading" /></c:set>
 		<lams:Page title="${title}" type="navbar" formID="imageGalleryForm">
 			<form:hidden path="imageGallery.contentId"/>
Index: lams_tool_images/web/pages/authoring/parts/addimage.jsp
===================================================================
diff -u -r7e1926a1f28d55c8de63720fbc97f918de5cc711 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_images/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision 7e1926a1f28d55c8de63720fbc97f918de5cc711)
+++ lams_tool_images/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -1,15 +1,15 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="csrfToken"><csrf:token/></c:set>
 <c:choose>
 	<c:when test="${saveUsingLearningAction}">
-		<c:set var="FORM_ACTION" value="../learning/saveNewImage.do?${csrfToken}"/>
+		<c:set var="FORM_ACTION" value="../learning/saveNewImage.do"/>
 	</c:when>
 	<c:otherwise>
-		<c:set var="FORM_ACTION" value="saveOrUpdateImage.do?${csrfToken}"/>
+		<c:set var="FORM_ACTION" value="saveOrUpdateImage.do"/>
 	</c:otherwise>
 </c:choose>
 
 <form:form action="${FORM_ACTION}" method="post" modelAttribute="imageGalleryItemForm" id="imageGalleryItemForm" enctype="multipart/form-data">
+	<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 	<c:set var="sessionMap"	value="${sessionScope[imageGalleryForm.sessionMapID]}" />
 	
 	<div class="panel panel-default">
Index: lams_tool_images/web/pages/monitoring/imagesummary.jsp
===================================================================
diff -u -r7e1926a1f28d55c8de63720fbc97f918de5cc711 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_images/web/pages/monitoring/imagesummary.jsp	(.../imagesummary.jsp)	(revision 7e1926a1f28d55c8de63720fbc97f918de5cc711)
+++ lams_tool_images/web/pages/monitoring/imagesummary.jsp	(.../imagesummary.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -45,8 +45,8 @@
 		</div>
 			
 		<div class="panel-body">
-            <c:set var="csrfToken"><csrf:token/></c:set>
-			<form:form action="updateImage.do?${csrfToken}" method="post" modelAttribute="imageGalleryItemForm" id="imageGalleryItemForm">
+			<form:form action="updateImage.do" method="post" modelAttribute="imageGalleryItemForm" id="imageGalleryItemForm">
+				<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 				<form:hidden path="imageUid" />		
 				<form:hidden path="sessionMapID" value="${sessionMapID}"/>
 				
Index: lams_tool_imscc/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_imscc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 845b503553ad948cb5db7b89950f7c5251ada5d7)
+++ lams_tool_imscc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -66,8 +66,8 @@
     </script>
 </lams:head>
 <body class="stripes" onLoad="init()">
-	<c:set var="csrfToken"><csrf:token/></c:set>
-	<form:form action="update.do?${csrfToken}" modelAttribute="authoringForm" method="post" id="authoringForm" enctype="multipart/form-data">
+	<form:form action="update.do" modelAttribute="authoringForm" method="post" id="authoringForm" enctype="multipart/form-data">
+		<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 	
 		<c:set var="title"><fmt:message key="label.author.title" /></c:set>
 		<lams:Page title="${title}" type="navbar">
Index: lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp
===================================================================
diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 845b503553ad948cb5db7b89950f7c5251ada5d7)
+++ lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -75,8 +75,8 @@
 	
 </lams:head>
 <body onLoad="init();" class="stripes">
-	<c:set var="csrfToken"><csrf:token/></c:set>
-	<form:form  action="submitAllContent.do?${csrfToken}" modelAttribute="mcAuthoringForm" id="mcAuthoringForm" enctype="multipart/form-data" method="POST" target="_self">
+	<form:form  action="submitAllContent.do" modelAttribute="mcAuthoringForm" id="mcAuthoringForm" enctype="multipart/form-data" method="POST" target="_self">
+		<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 		<form:hidden path="httpSessionID" value="${sessionMapId}"/>
 			
 		<c:set var="title"><fmt:message key="activity.title" /></c:set>
@@ -106,4 +106,4 @@
 	</form:form>
 	
 </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp
===================================================================
diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 845b503553ad948cb5db7b89950f7c5251ada5d7)
+++ lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -43,8 +43,8 @@
 </lams:head>
 
 <body class="stripes">
-<c:set var="csrfToken"><csrf:token/></c:set>
-<form:form action="submitAllContent.do?${csrfToken}" modelAttribute="authoringForm" method="POST" id="authoringForm">
+<form:form action="submitAllContent.do" modelAttribute="authoringForm" method="POST" id="authoringForm">
+	<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 	<c:set var="sessionMap" value="${sessionScope[authoringForm.httpSessionID]}" />
 	<c:set var="title"><fmt:message key="activity.title" /></c:set>
 	
Index: lams_tool_larsrc/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_larsrc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 845b503553ad948cb5db7b89950f7c5251ada5d7)
+++ lams_tool_larsrc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -64,8 +64,8 @@
     </script> 
 </lams:head>
 <body class="stripes" onLoad="init()">
-	<c:set var="csrfToken"><csrf:token/></c:set>
-	<form:form action="update.do?${csrfToken}" method="post" modelAttribute="authoringForm" id="authoringForm">
+	<form:form action="update.do" method="post" modelAttribute="authoringForm" id="authoringForm">
+		<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 		<form:hidden path="resource.contentId" />
 		<form:hidden path="mode" />
 		<form:hidden path="sessionMapID" />
Index: lams_tool_leader/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_leader/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 845b503553ad948cb5db7b89950f7c5251ada5d7)
+++ lams_tool_leader/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -25,8 +25,8 @@
 		<script type="text/javascript" src="${tool}includes/javascript/authoring.js"></script>
 	</lams:head>
 	<body class="stripes" onload="init();">
-		<c:set var="csrfToken"><csrf:token/></c:set>
-		<form:form action="/lams/tool/lalead11/authoring/updateContent.do?${csrfToken}"  modelAttribute="authoringForm" id="authoringForm" method="post" >
+		<form:form action="/lams/tool/lalead11/authoring/updateContent.do"  modelAttribute="authoringForm" id="authoringForm" method="post" >
+			<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 			<c:set var="sessionMap" value="${sessionScope[authoringForm.sessionMapID]}" />
 			<c:set var="title">
 				<fmt:message key="activity.title" />
Index: lams_tool_leader/web/pages/monitoring/manageLeaders.jsp
===================================================================
diff -u -r8a0116b9f105c1a090bd8adbac814e54f32673e3 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_leader/web/pages/monitoring/manageLeaders.jsp	(.../manageLeaders.jsp)	(revision 8a0116b9f105c1a090bd8adbac814e54f32673e3)
+++ lams_tool_leader/web/pages/monitoring/manageLeaders.jsp	(.../manageLeaders.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -32,8 +32,8 @@
 
 	<c:set var="title"><fmt:message key="label.plese.select.leaders" /></c:set>
 	<lams:Page type="learner" title="${title}">
-	<c:set var="csrfToken"><csrf:token/></c:set>		
-		<form action="<c:url value='/monitoring/saveLeaders.do?${csrfToken}'/>" method="post" id="leaders">
+		<form action="<c:url value='/monitoring/saveLeaders.do'/>" method="post" id="leaders">
+			<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
                 <input name="sessionMapID" type="hidden" value="${sessionMapID}"/>
 				<c:forEach var="session" items="${sessionMap.leaderselectionDT0.sessionDTOs}" varStatus="status">
 					<h1></h1>
Index: lams_tool_mindmap/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_mindmap/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 845b503553ad948cb5db7b89950f7c5251ada5d7)
+++ lams_tool_mindmap/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -40,8 +40,8 @@
 	
 		<c:set var="title"><fmt:message key="activity.title" /></c:set>
 		<lams:Page title="${title}" type="navbar" formID="authoringForm">
-			<c:set var="csrfToken"><csrf:token/></c:set>
-			<form:form action="updateContent.do?${csrfToken}" id="authoringForm" modelAttribute="authoringForm" method="post" enctype="multipart/form-data">
+			<form:form action="updateContent.do" id="authoringForm" modelAttribute="authoringForm" method="post" enctype="multipart/form-data">
+				<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 				<c:set var="sessionMap" value="${sessionScope[authoringForm.sessionMapID]}" />
 				
 				<form:hidden path="currentTab" id="currentTab" />
Index: lams_tool_nb/web/authoring/authoring.jsp
===================================================================
diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_nb/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 845b503553ad948cb5db7b89950f7c5251ada5d7)
+++ lams_tool_nb/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -52,8 +52,8 @@
 </lams:head>
 
 <body class="stripes" onLoad="init()">
-<c:set var="csrfToken"><csrf:token/></c:set>
-<form:form modelAttribute="nbAuthoringForm" action="save.do" id="nbAuthoringForm?${csrfToken}" enctype="multipart/form-data">
+<form:form modelAttribute="nbAuthoringForm" action="save.do" id="nbAuthoringForm" enctype="multipart/form-data">
+	<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 
 <c:set var="title"><fmt:message key="activity.title" /></c:set>
 <lams:Page title="${title}" type="navbar" formID="nbAuthoringForm">
Index: lams_tool_notebook/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_notebook/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 845b503553ad948cb5db7b89950f7c5251ada5d7)
+++ lams_tool_notebook/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -8,8 +8,8 @@
 		<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/authoring.js"></script>
 	</lams:head>
 	<body class="stripes">
-		<c:set var="csrfToken"><csrf:token/></c:set>
-		<form:form action="/lams/tool/lantbk11/authoring/updateContent.do?${csrfToken}" modelAttribute="authoringForm" id="authoringForm" method="post">
+		<form:form action="/lams/tool/lantbk11/authoring/updateContent.do" modelAttribute="authoringForm" id="authoringForm" method="post">
+			<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 			<c:set var="sessionMap" value="${sessionScope[authoringForm.sessionMapID]}" />
 			<c:set var="title"><fmt:message key="activity.title" /></c:set>
 	
@@ -52,4 +52,4 @@
 </form:form>
 		<div class="footer"></div>					
 	</body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_pixlr/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_pixlr/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 845b503553ad948cb5db7b89950f7c5251ada5d7)
+++ lams_tool_pixlr/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -54,8 +54,8 @@
 					}		
 				}
 			</script>	
-			<c:set var="csrfToken"><csrf:token/></c:set>
-			<form:form action="/lams/tool/lapixl10/authoring/updateContent.do?${csrfToken}" modelAttribute="authoringForm" id="authoringForm" method="post" enctype="multipart/form-data"  onsubmit="return validate();">
+			<form:form action="/lams/tool/lapixl10/authoring/updateContent.do" modelAttribute="authoringForm" id="authoringForm" method="post" enctype="multipart/form-data"  onsubmit="return validate();">
+				<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 				<c:set var="sessionMap" value="${sessionScope[authoringForm.sessionMapID]}" />
 				
 				<form:hidden path="currentTab" id="currentTab" />
Index: lams_tool_preview/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_preview/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 845b503553ad948cb5db7b89950f7c5251ada5d7)
+++ lams_tool_preview/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -29,8 +29,8 @@
     </script>
 </lams:head>
 <body class="stripes" onLoad="init()">
-<c:set var="csrfToken"><csrf:token/></c:set>
-<form:form action="update.do?${csrfToken}" method="post" modelAttribute="peerreviewForm" enctype="multipart/form-data">
+<form:form action="update.do" method="post" modelAttribute="peerreviewForm" enctype="multipart/form-data">
+	<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 	<form:hidden path="peerreview.contentId" />
 	<input type="hidden" name="mode" value="${mode}"/>
 	<form:hidden path="sessionMapID" />
Index: lams_tool_sbmt/web/authoring/authoring.jsp
===================================================================
diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 845b503553ad948cb5db7b89950f7c5251ada5d7)
+++ lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -23,8 +23,8 @@
     </script>
 </lams:head>
 <body class="stripes">
-<c:set var="csrfToken"><csrf:token/></c:set>
-<form:form action="updateContent.do?${csrfToken}" id="authoringForm" modelAttribute="authoringForm" method="post" enctype="multipart/form-data">
+<form:form action="updateContent.do" id="authoringForm" modelAttribute="authoringForm" method="post" enctype="multipart/form-data">
+	<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 	<c:set var="sessionMap" value="${sessionScope[authoringForm.sessionMapID]}" />
 	<c:set var="title"><fmt:message key="activity.title" /></c:set>
 	
@@ -63,4 +63,4 @@
 	</lams:Page>
 </form:form>
 </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_sbmt/web/monitoring/mark/updatemark.jsp
===================================================================
diff -u -rfea3637199c74851ed7a8fa620da1ccb898be819 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_sbmt/web/monitoring/mark/updatemark.jsp	(.../updatemark.jsp)	(revision fea3637199c74851ed7a8fa620da1ccb898be819)
+++ lams_tool_sbmt/web/monitoring/mark/updatemark.jsp	(.../updatemark.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -55,9 +55,9 @@
 <body class="stripes">
 <c:set var="title"><fmt:message key="label.monitoring.updateMarks.button" /></c:set>
 <lams:Page title="${title}" type="monitor">
-<c:set var="csrfToken"><csrf:token/></c:set>
 		<c:forEach var="fileInfo" items="${report}" varStatus="status">
-			<form:form action="updateMark.do?${csrfToken}" method="post" modelAttribute="markForm" id="updateMarkForm" enctype="multipart/form-data" onsubmit="return validate();">
+			<form:form action="updateMark.do" method="post" modelAttribute="markForm" id="updateMarkForm" enctype="multipart/form-data" onsubmit="return validate();">
+				<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 			
 				<form:hidden path="toolSessionID" />
 				<form:hidden path="reportID" />
Index: lams_tool_sbmt/web/monitoring/parts/summary.jsp
===================================================================
diff -u -rfea3637199c74851ed7a8fa620da1ccb898be819 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision fea3637199c74851ed7a8fa620da1ccb898be819)
+++ lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -205,8 +205,8 @@
 				<fmt:message key="label.monitoring.releaseMarks.button" />
 			</button>
 		</c:if>
-        <c:set var="csrfToken"><csrf:token/></c:set>
-		<form action="downloadMarks.do?${csrfToken}" method="post" style="display:inline">
+		<form action="downloadMarks.do" method="post" style="display:inline">
+			<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 			<input type="hidden" name="toolSessionID" value="${sessionDto.sessionID}" />
 			<input type="submit" name="downloadMarks" value="<fmt:message key="label.monitoring.downloadMarks.button" />" class="btn btn-default loffset5 voffset10" />
 		</form>
Index: lams_tool_scratchie/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_scratchie/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 845b503553ad948cb5db7b89950f7c5251ada5d7)
+++ lams_tool_scratchie/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -39,8 +39,8 @@
  
 </lams:head>
 <body class="stripes" onLoad="init()">
-	<c:set var="csrfToken"><csrf:token/></c:set>
-	<form:form action="/lams/tool/lascrt11/authoring/update.do?${csrfToken}" modelAttribute="authoringForm" method="post" id="authoringForm" >
+	<form:form action="/lams/tool/lascrt11/authoring/update.do" modelAttribute="authoringForm" method="post" id="authoringForm" >
+		<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 		<form:hidden path="scratchie.contentId" />
 		<form:hidden path="sessionMapID" />
 		<form:hidden path="contentFolderID" />
Index: lams_tool_scribe/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_scribe/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 845b503553ad948cb5db7b89950f7c5251ada5d7)
+++ lams_tool_scribe/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -25,9 +25,8 @@
 		</script>
 	</lams:head>
 	<body class="stripes" onload="init();">
-		<c:set var="csrfToken"><csrf:token/></c:set>
-		<form:form action="/lams/tool/lascrb11/authoring/updateContent.do?${csrfToken}" modelAttribute="authoringForm" id="authoringForm" method="post">
-		
+		<form:form action="/lams/tool/lascrb11/authoring/updateContent.do" modelAttribute="authoringForm" id="authoringForm" method="post">
+			<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 			<c:set var="sessionMap" value="${sessionScope[authoringForm.sessionMapID]}" />
 		
 			<c:set var="title"><fmt:message key="activity.title" /></c:set>
Index: lams_tool_scribe/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r81dd463b85273eb0154d89ef7694101de563197b -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_scribe/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 81dd463b85273eb0154d89ef7694101de563197b)
+++ lams_tool_scribe/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -64,8 +64,8 @@
 	<div class="loffset5">
 		<c:choose>
 			<c:when test="${not empty session.userDTOs and (not dto.autoSelectScribe or session.appointedScribe != null)}">
-            <c:set var="csrfToken"><csrf:token/></c:set>
-				<form:form action="/lams/tool/lascrb11/monitoring/appointScribe.do?${csrfToken}" modelAttribute="monitoringForm" method="post">
+				<form:form action="/lams/tool/lascrb11/monitoring/appointScribe.do" modelAttribute="monitoringForm" method="post">
+					<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 		
 					<form:hidden path="toolSessionID" value="${session.sessionID}" />
 					<form:hidden path="contentFolderID" />
Index: lams_tool_spreadsheet/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_spreadsheet/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 845b503553ad948cb5db7b89950f7c5251ada5d7)
+++ lams_tool_spreadsheet/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -37,8 +37,8 @@
     </script> 
 </lams:head>
 <body class="stripes" onLoad="init()">
-<c:set var="csrfToken"><csrf:token/></c:set>
-<form:form action="updateContent.do?${csrfToken}" method="post" id="spreadsheetForm" modelAttribute="spreadsheetForm" enctype="multipart/form-data" onsubmit="return onSubmitHandler();">
+<form:form action="updateContent.do" method="post" id="spreadsheetForm" modelAttribute="spreadsheetForm" enctype="multipart/form-data" onsubmit="return onSubmitHandler();">
+	<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 	<form:hidden path="spreadsheet.contentId" />
 	<form:hidden path="sessionMapID" />
 	<form:hidden path="contentFolderID" />
Index: lams_tool_survey/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_survey/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 845b503553ad948cb5db7b89950f7c5251ada5d7)
+++ lams_tool_survey/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -28,8 +28,8 @@
 
 </lams:head>
 <body class="stripes" onLoad="init()">
-	<c:set var="csrfToken"><csrf:token/></c:set>
-	<form:form action="update.do?${csrfToken}" method="post" modelAttribute="authoringForm" id="authoringForm">
+	<form:form action="update.do" method="post" modelAttribute="authoringForm" id="authoringForm">
+		<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 		<form:hidden path="survey.contentId" />
 		<input type="hidden" name="mode" value="${mode}"/>
 		<form:hidden path="sessionMapID" />
Index: lams_tool_task/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_task/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 845b503553ad948cb5db7b89950f7c5251ada5d7)
+++ lams_tool_task/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -63,8 +63,8 @@
 </lams:head>
 
 <body class="stripes" onLoad="init()">
-<c:set var="csrfToken"><csrf:token/></c:set>
-<form:form action="update.do?${csrfToken}" method="post" modelAttribute="taskListForm" id="taskListForm">
+<form:form action="update.do" method="post" modelAttribute="taskListForm" id="taskListForm">
+	<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 	<form:hidden path="taskList.contentId" />
 	<input type="hidden" name="mode" value="${mode}"/>
 	<form:hidden path="sessionMapID" />
Index: lams_tool_vote/web/authoring/AuthoringMaincontent.jsp
===================================================================
diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_vote/web/authoring/AuthoringMaincontent.jsp	(.../AuthoringMaincontent.jsp)	(revision 845b503553ad948cb5db7b89950f7c5251ada5d7)
+++ lams_tool_vote/web/authoring/AuthoringMaincontent.jsp	(.../AuthoringMaincontent.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -107,8 +107,8 @@
 	
 </lams:head>
 <body class="stripes" ><!-- onLoad="init();" -->
-	<c:set var="csrfToken"><csrf:token/></c:set>
-	<form:form modelAttribute="voteAuthoringForm" action="submitAllContent.do?${csrfToken}" method="POST">
+	<form:form modelAttribute="voteAuthoringForm" action="submitAllContent.do" method="POST">
+		<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 		<form:hidden path="toolContentID"/>
 		<form:hidden path="currentTab" styleId="currentTab" />
 		<form:hidden path="httpSessionID"/>									
Index: lams_tool_wiki/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_wiki/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 845b503553ad948cb5db7b89950f7c5251ada5d7)
+++ lams_tool_wiki/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -40,9 +40,8 @@
 	</lams:head>
 
 	<body class="stripes">
-		<c:set var="csrfToken"><csrf:token/></c:set>
-		<form:form action="updateContent.do?${csrfToken}" id="authoringForm" modelAttribute="authoringForm" method="post" enctype="multipart/form-data">
-
+		<form:form action="updateContent.do" id="authoringForm" modelAttribute="authoringForm" method="post" enctype="multipart/form-data">
+			<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 			<c:set var="sessionMap" value="${sessionScope[authoringForm.sessionMapID]}" />
 		
 			<form:hidden path="currentTab" id="currentTab" />
Index: lams_tool_zoom/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c
--- lams_tool_zoom/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 845b503553ad948cb5db7b89950f7c5251ada5d7)
+++ lams_tool_zoom/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
@@ -26,8 +26,8 @@
 
 <body class="stripes" onload="init();">
 	<lams:Page title="pageTitle.authoring" type="navbar">
-		<c:set var="csrfToken"><csrf:token/></c:set>
-		<form:form action="updateContent.do?${csrfToken}" modelAttribute="authoringForm" method="post" enctype="multipart/form-data">
+		<form:form action="updateContent.do" modelAttribute="authoringForm" method="post" enctype="multipart/form-data">
+			<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 			<c:set var="title">
 				<fmt:message key="activity.title" />
 			</c:set>
@@ -61,4 +61,4 @@
 		</form:form>
 	</lams:Page>
 </body>
-</lams:html>
\ No newline at end of file
+</lams:html>