Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java,v
diff -u -r1.32.2.8 -r1.32.2.9
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java	24 Jan 2017 13:25:48 -0000	1.32.2.8
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java	17 Mar 2017 04:57:55 -0000	1.32.2.9
@@ -143,6 +143,7 @@
 	DynaActionForm groupForm = (DynaActionForm) form;
 	groupForm.set("previewLesson", learnerProgress.getLesson().isPreviewLesson());
 	groupForm.set("title", activity.getTitle());
+	groupForm.set(AttributeNames.PARAM_ACTIVITY_ID, activity.getActivityId());
 
 	request.setAttribute(AttributeNames.PARAM_LESSON_ID, lessonId);
 	if (groupingDone) {
Index: lams_learning/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/Attic/struts-config.xml,v
diff -u -r1.1.2.4 -r1.1.2.5
--- lams_learning/web/WEB-INF/struts-config.xml	3 Feb 2017 11:39:46 -0000	1.1.2.4
+++ lams_learning/web/WEB-INF/struts-config.xml	17 Mar 2017 04:57:55 -0000	1.1.2.5
@@ -25,6 +25,7 @@
    <form-bean name="GroupingForm"  type="org.apache.struts.action.DynaActionForm">
 	<form-property name="title" type="java.lang.String" />
 	<form-property name="previewLesson" type="java.lang.Boolean" />
+	<form-property name="activityID" type="java.lang.Long" />
 	<!--  used for updating the the progress bar -->
 	<form-property name="lessonID" type="java.lang.Long" />
 	<form-property name="version" type="java.lang.Integer" />
Index: lams_learning/web/grouping/wait.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/grouping/wait.jsp,v
diff -u -r1.7.16.1 -r1.7.16.2
--- lams_learning/web/grouping/wait.jsp	12 Mar 2016 23:48:18 -0000	1.7.16.1
+++ lams_learning/web/grouping/wait.jsp	17 Mar 2017 04:57:55 -0000	1.7.16.2
@@ -26,22 +26,18 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<c:set var="formAction">/grouping.do?method=performGrouping&activityID=${activity.activityId}</c:set>
-<c:if test="${GroupingForm.map.previewLesson == true}">
-	<c:set var="formAction">
-		<c:out value="${formAction}" />&force=true</c:set>
-</c:if>
-
 <lams:Page type="learner" title="${GroupingForm.map.title}">
-	<html:form action="${formAction}" target="_self">
+	<html:form action="/grouping.do" target="_self">
+		<input type="hidden" name="method" value="performGrouping" />
+		<input type="hidden" name="activityID" value="${GroupingForm.map.activityID}" />
+		<input type="hidden" name="force" value="${GroupingForm.map.previewLesson}" />
+		
 
 		<lams:Alert id="waitingGroups" close="false" type="info">
 			<fmt:message key="label.view.view.groups.wait.message" />
 		</lams:Alert>
 
 		<c:if test="${GroupingForm.map.previewLesson == true}">
-			<c:set var="formAction">
-				<c:out value="${formAction}" />&force=true</c:set>
 			<div class="voffset10">
 				<em><fmt:message key="label.grouping.preview.message" /></em>
 			</div>