Index: lams_central/conf/security/Owasp.CsrfGuard.properties
===================================================================
diff -u -r1beaa4cc5e224dd433297d543c5511234c0bfc10 -rf04cfe28c0e223b4feca038d911fcb6ce2f40032
--- lams_central/conf/security/Owasp.CsrfGuard.properties	(.../Owasp.CsrfGuard.properties)	(revision 1beaa4cc5e224dd433297d543c5511234c0bfc10)
+++ lams_central/conf/security/Owasp.CsrfGuard.properties	(.../Owasp.CsrfGuard.properties)	(revision f04cfe28c0e223b4feca038d911fcb6ce2f40032)
@@ -8,6 +8,7 @@
 # A key suffix must not contain a dot "." character
 org.owasp.csrfguard.protected.centralSaveUserProfile=/lams/saveprofile.do
 
+org.owasp.csrfguard.protected.assessmentDefineLater=/lams/tool/laasse10/authoring/definelater.do
 org.owasp.csrfguard.protected.assessmentSubmissionDeadline=/lams/tool/laasse10/monitoring/setSubmissionDeadline.do
 org.owasp.csrfguard.protected.chatSubmissionDeadline=/lams/tool/lachat11/monitoring/setSubmissionDeadline.do
 org.owasp.csrfguard.protected.forumAuthoringSave=/lams/tool/lafrum11/authoring/update.do
Index: lams_central/web/includes/javascript/common.js
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rf04cfe28c0e223b4feca038d911fcb6ce2f40032
--- lams_central/web/includes/javascript/common.js	(.../common.js)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/includes/javascript/common.js	(.../common.js)	(revision f04cfe28c0e223b4feca038d911fcb6ce2f40032)
@@ -15,7 +15,7 @@
 //		}	
 }
 
-function launchPopup(url,title) {
+function launchPopup(url, title) {
 	var wd = null;
 	if(wd && wd.open && !wd.closed){
 		wd.close();
@@ -25,7 +25,12 @@
 		top = ((screen.height / 2) - (648 / 2)) / 2;
 	wd = window.open(url,title,'resizable,width=1152,height=648,scrollbars,top=' + top + ',left=' + left);
 	wd.window.focus();
-}	
+}
+
+function launchDefineLaterPopup() {
+	launchPopup('about:blank', 'definelater');
+	document.getElementById('define-later-form').submit();
+}
 	
 function filterData(src,target){
 	if(src.value != null) {
Index: lams_tool_assessment/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -rd2d109684f5c5eaa4c7638861c86a31beb877eb5 -rf04cfe28c0e223b4feca038d911fcb6ce2f40032
--- lams_tool_assessment/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision d2d109684f5c5eaa4c7638861c86a31beb877eb5)
+++ lams_tool_assessment/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision f04cfe28c0e223b4feca038d911fcb6ce2f40032)
@@ -27,11 +27,13 @@
 
 	<tr>
 		<td colspan="2">
-			<c:url  var="authoringUrl" value="/authoring/definelater.do">
-				<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
-				<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
-			</c:url>
-			<a href="#nogo" onclick="javascript:launchPopup('${authoringUrl}','definelater')" class="btn btn-default pull-right">
+			<form id='define-later-form' method='post' action='../authoring/definelater.do' target='definelater'>
+				<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
+				<input type="hidden" name="toolContentID" value="${sessionMap.toolContentID}" />
+				<input type="hidden" name="contentFolderID" value="${sessionMap.contentFolderID}" />
+			</form>
+
+			<a href="#nogo" onclick="javascript:launchDefineLaterPopup()" class="btn btn-default pull-right">
 				<fmt:message key="label.monitoring.edit.activity.edit" />
 			</a>
 		</td>