Index: lams_learning/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -re05b81029b4cc80200194dd099736ee8af7e456e -r5fdd0db818db4e588ee274e14be36b37aea7641c
--- lams_learning/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e05b81029b4cc80200194dd099736ee8af7e456e)
+++ lams_learning/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 5fdd0db818db4e588ee274e14be36b37aea7641c)
@@ -89,6 +89,6 @@
 export.portfolio.generation.complete.message  =Export Portfolio completed
 label.synch.gate.message  =You have stopped at a gate. You cannot continue until all of your group/class reach this point. You must have at least 2 learners waiting for the gate to open.
 label.preview.definelater.branching.message  =The next activity ({0}) is set to define in monitor. Normally a staff member would configure the branches in monitoring. For the purposes of preview, you will be able to select which branch to preview.
+label.optional.maxReached  =Maximum number optional activities reached.
 
-
 #======= End labels: Exported 83 labels for en AU =====
Index: lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -re05b81029b4cc80200194dd099736ee8af7e456e -r5fdd0db818db4e588ee274e14be36b37aea7641c
--- lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision e05b81029b4cc80200194dd099736ee8af7e456e)
+++ lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 5fdd0db818db4e588ee274e14be36b37aea7641c)
@@ -89,6 +89,6 @@
 export.portfolio.generation.complete.message  =Export Portfolio completed
 label.synch.gate.message  =You have stopped at a gate. You cannot continue until all of your group/class reach this point. You must have at least 2 learners waiting for the gate to open.
 label.preview.definelater.branching.message  =The next activity ({0}) is set to define in monitor. Normally a staff member would configure the branches in monitoring. For the purposes of preview, you will be able to select which branch to preview.
+label.optional.maxReached  =Maximum number optional activities reached.
 
-
 #======= End labels: Exported 83 labels for en AU =====
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
===================================================================
diff -u -r560c00149837e66be2b9f4cbcbff95ff23a4dc28 -r5fdd0db818db4e588ee274e14be36b37aea7641c
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java	(.../DisplayOptionsActivityAction.java)	(revision 560c00149837e66be2b9f4cbcbff95ff23a4dc28)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java	(.../DisplayOptionsActivityAction.java)	(revision 5fdd0db818db4e588ee274e14be36b37aea7641c)
@@ -101,6 +101,12 @@
 		if ( optionsActivity.getMinNumberOfOptionsNotNull().intValue() <= completedCount ) {
 			form.setFinished(true);
 		}
+		
+		if (completedCount >= optionsActivity.getMaxNumberOfOptionsNotNull().intValue()  )
+		{
+			form.setMaxActivitiesReached(true);
+		}
+			
 		form.setMinimum(optionsActivity.getMinNumberOfOptionsNotNull().intValue());
 		form.setMaximum(optionsActivity.getMaxNumberOfOptionsNotNull().intValue());
 		form.setDescription(optionsActivity.getDescription());
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/OptionsActivityForm.java
===================================================================
diff -u -re023857e217082f46fd3235d5673129ffccf6ff4 -r5fdd0db818db4e588ee274e14be36b37aea7641c
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/OptionsActivityForm.java	(.../OptionsActivityForm.java)	(revision e023857e217082f46fd3235d5673129ffccf6ff4)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/OptionsActivityForm.java	(.../OptionsActivityForm.java)	(revision 5fdd0db818db4e588ee274e14be36b37aea7641c)
@@ -38,6 +38,7 @@
 	private int maximum;
 	private boolean finished;
 	private Long progressID;
+	private boolean maxActivitiesReached;
 	
 	public String getTitle() {
 		return title;
@@ -75,4 +76,10 @@
 	public void setProgressID(Long progressID) {
 		this.progressID = progressID;
 	}
+	public boolean isMaxActivitiesReached() {
+		return maxActivitiesReached;
+	}
+	public void setMaxActivitiesReached(boolean maxActivitiesReached) {
+		this.maxActivitiesReached = maxActivitiesReached;
+	}
 }
Index: lams_learning/web/optionsActivity.jsp
===================================================================
diff -u -r753b952ef68db777c6278b3996e433291ef12617 -r5fdd0db818db4e588ee274e14be36b37aea7641c
--- lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision 753b952ef68db777c6278b3996e433291ef12617)
+++ lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision 5fdd0db818db4e588ee274e14be36b37aea7641c)
@@ -80,11 +80,18 @@
 					<c:set var="numActivities" value="${loop.count}" />
 					<tr>
 						<td width="2%">
-							<c:if test="${not activityURL.complete}">
-								<input type="radio" name="activityID" class="noBorder"
-									id="activityID-${activityURL.activityId}"
-									value="${activityURL.activityId}">
-							</c:if>
+							<c:choose>
+								<c:when test="${not activityURL.complete and not optionsActivityForm.maxActivitiesReached}">
+									<input type="radio" name="activityID" class="noBorder"
+										id="activityID-${activityURL.activityId}"
+										value="${activityURL.activityId}">
+								
+								
+								</c:when>
+								<c:when test="${activityURL.complete}">
+									<img src="<lams:LAMSURL/>/images/tick.gif" />
+								</c:when>
+							</c:choose>
 						</td>
 						<td>
 							<c:choose>
@@ -103,9 +110,19 @@
 			</table>
 
 			<div align="center" class="small-space-bottom">
-				<html:submit styleClass="button">
-					<fmt:message key="label.activity.options.choose" />
-				</html:submit>
+				
+				<c:choose>
+					<c:when test="${optionsActivityForm.maxActivitiesReached}">
+						<p class="warning">
+							<fmt:message key="label.optional.maxReached" /> 
+						</p>
+					</c:when>
+					<c:otherwise>
+						<html:submit styleClass="button">
+							<fmt:message key="label.activity.options.choose" />
+						</html:submit>
+					</c:otherwise>
+				</c:choose>
 			</div>
 
 		</html:form>