Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java
===================================================================
diff -u -r1688016bbb43db756bca9b93361c2a3833089d12 -rc2388b4c760cc0a05554b831b3205e4831f6e17b
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java	(.../SbmtConstants.java)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java	(.../SbmtConstants.java)	(revision c2388b4c760cc0a05554b831b3205e4831f6e17b)
@@ -37,7 +37,7 @@
 
     public static final String USER_ID = "userID";
 
-    public static final String PAGE_EDITABLE = "isPageEditable";
+    public static final String CONTENT_IN_USE = "isContentInUse";
 
     public static final String ATTR_FILE_TYPE_FLAG = "fileTypeFlag";
 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java
===================================================================
diff -u -r2fc43e946ceac81d8635ac056d0896cbc4750bb7 -rc2388b4c760cc0a05554b831b3205e4831f6e17b
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java	(.../LearnerAction.java)	(revision 2fc43e946ceac81d8635ac056d0896cbc4750bb7)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java	(.../LearnerAction.java)	(revision c2388b4c760cc0a05554b831b3205e4831f6e17b)
@@ -468,13 +468,17 @@
 	}
 
 	// preset
+	// Monitor can edit the activity and set a limit / decreased the limit with
+	// the learner having already uploaded more files so ensure code handles that case.
 	boolean limitUpload = (Boolean) sessionMap.get(SbmtConstants.ATTR_LIMIT_UPLOAD);
 	if (limitUpload && filesUploaded != null) {
 	    int limit = (Integer) sessionMap.get(SbmtConstants.ATTR_LIMIT_UPLOAD_NUMBER);
-	    if (limit == filesUploaded.size()) {
+	    int limitUploadLeft = 0;
+	    if (limit <= filesUploaded.size()) {
 		sessionMap.put(SbmtConstants.ATTR_ARRIVE_LIMIT, true);
+	    } else {
+		limitUploadLeft = limit - filesUploaded.size();
 	    }
-	    int limitUploadLeft = limit - filesUploaded.size();
 	    dto.setLimitUploadLeft(limitUploadLeft);
 	}
 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java
===================================================================
diff -u -reeb8faaea5372ccf5445d7172f726931e9f26098 -rc2388b4c760cc0a05554b831b3205e4831f6e17b
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision eeb8faaea5372ccf5445d7172f726931e9f26098)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision c2388b4c760cc0a05554b831b3205e4831f6e17b)
@@ -130,7 +130,7 @@
 
 	AuthoringDTO authorDto = new AuthoringDTO(persistContent);
 	request.setAttribute(SbmtConstants.AUTHORING_DTO, authorDto);
-	request.setAttribute(SbmtConstants.PAGE_EDITABLE, !persistContent.isContentInUse());
+	request.setAttribute(SbmtConstants.CONTENT_IN_USE, persistContent.isContentInUse());
 	request.setAttribute(SbmtConstants.ATTR_IS_GROUPED_ACTIVITY, submitFilesService.isGroupedActivity(contentID));
 	request.setAttribute(SbmtConstants.ATTR_REFLECTION_ON, persistContent.isReflectOnActivity());
 
Index: lams_tool_sbmt/web/monitoring/parts/activity.jsp
===================================================================
diff -u -r58448aa728e808e025d15546ea5375e6db321ff3 -rc2388b4c760cc0a05554b831b3205e4831f6e17b
--- lams_tool_sbmt/web/monitoring/parts/activity.jsp	(.../activity.jsp)	(revision 58448aa728e808e025d15546ea5375e6db321ff3)
+++ lams_tool_sbmt/web/monitoring/parts/activity.jsp	(.../activity.jsp)	(revision c2388b4c760cc0a05554b831b3205e4831f6e17b)
@@ -2,7 +2,7 @@
 
 <html:errors />
 
-<c:if test="${!isPageEditable}">
+<c:if test="${isContentInUse}">
 	<lams:Alert type="warn" id="no-edit" close="false">
 		<fmt:message key="message.alertContentEdit" />
 	</lams:Alert>
@@ -29,13 +29,11 @@
 	</tr>
 </table>
 
-<c:if test='${isPageEditable}'>
-	<c:url value="/authoring.do" var="authoringUrl">
-		<c:param name="mode" value="teacher" />
-		<c:param name="contentFolderID" value="${contentFolderID}" />
-		<c:param name="toolContentID" value="${toolContentID}" />
-	</c:url>
-	<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
-		<fmt:message key="label.monitoring.edit.activity.edit" />
-	</html:link>
-</c:if>
\ No newline at end of file
+<c:url value="/authoring.do" var="authoringUrl">
+	<c:param name="mode" value="teacher" />
+	<c:param name="contentFolderID" value="${contentFolderID}" />
+	<c:param name="toolContentID" value="${toolContentID}" />
+</c:url>
+<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
+	<fmt:message key="label.monitoring.edit.activity.edit" />
+</html:link>