Index: lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r3a20262b8ddbeff34de6dd5b77348f71666d1410 -rca10d5f847158b365d5dec170b298f29a9b2ace7
--- lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 3a20262b8ddbeff34de6dd5b77348f71666d1410)
+++ lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ca10d5f847158b365d5dec170b298f29a9b2ace7)
@@ -116,6 +116,6 @@
 label.refresh  =Refresh
 label.spreadsheet.options  =Options
 label.activity.completion  =End of activity
+message.spreadsheet.marked  =You cannot change the spreadsheet as it has been marked.
 
-
 #======= End labels: Exported 110 labels for en AU =====
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rca10d5f847158b365d5dec170b298f29a9b2ace7
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java	(.../SpreadsheetConstants.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java	(.../SpreadsheetConstants.java)	(revision ca10d5f847158b365d5dec170b298f29a9b2ace7)
@@ -86,6 +86,7 @@
     public static final String ATTR_USER_UID = "userUid";
     public static final String ATTR_USER_NAME = "userName";
     public static final String ATTR_USER_MARK = "mark";
+    public static final String ATTR_USER_IS_MARKED = "userIsMarked";
     public static final String ATTR_CODE = "code";
 
     public static final String DEFUALT_PROTOCOL_REFIX = "http://";
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java
===================================================================
diff -u -r43642b8c0a3103bb12afd9d98d5966c97deac8c0 -rca10d5f847158b365d5dec170b298f29a9b2ace7
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java	(.../LearningAction.java)	(revision 43642b8c0a3103bb12afd9d98d5966c97deac8c0)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java	(.../LearningAction.java)	(revision ca10d5f847158b365d5dec170b298f29a9b2ace7)
@@ -185,12 +185,16 @@
 	sessionMap.put(SpreadsheetConstants.ATTR_RESOURCE, spreadsheet);
 
 	if ((spreadsheetUser != null) && (spreadsheetUser.getUserModifiedSpreadsheet() != null)
-		&& (spreadsheetUser.getUserModifiedSpreadsheet().getMark() != null)
-		&& (spreadsheetUser.getUserModifiedSpreadsheet().getMark().getDateMarksReleased() != null)) {
+		&& (spreadsheetUser.getUserModifiedSpreadsheet().getMark() != null)) {
+	    request.setAttribute(SpreadsheetConstants.ATTR_USER_IS_MARKED, true);
+	    if ( (spreadsheetUser.getUserModifiedSpreadsheet().getMark().getDateMarksReleased() != null)) {
 	    request.setAttribute(SpreadsheetConstants.ATTR_USER_MARK,
-		    spreadsheetUser.getUserModifiedSpreadsheet().getMark());
+		 spreadsheetUser.getUserModifiedSpreadsheet().getMark());
+	    }
+	} else {
+	    request.setAttribute(SpreadsheetConstants.ATTR_USER_IS_MARKED, false);
 	}
-
+	
 	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId,
 		request, getServlet().getServletContext());
 	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
@@ -228,13 +232,16 @@
 
 	    SpreadsheetUser spreadsheetUser = getCurrentUser(service, sessionId);
 	    UserModifiedSpreadsheet userModifiedSpreadsheet = spreadsheetUser.getUserModifiedSpreadsheet();
-	    if ( userModifiedSpreadsheet == null ) {
-	    	userModifiedSpreadsheet = new UserModifiedSpreadsheet();
-	    }
-	    String code = WebUtil.readStrParam(request, SpreadsheetConstants.ATTR_CODE);
-	    userModifiedSpreadsheet.setUserModifiedSpreadsheet(code);
-	    spreadsheetUser.setUserModifiedSpreadsheet(userModifiedSpreadsheet);
-	    service.saveOrUpdateUser(spreadsheetUser);
+
+	    if ( spreadsheetUser.getUserModifiedSpreadsheet() == null || spreadsheetUser.getUserModifiedSpreadsheet().getMark() == null ) {
+		if ( userModifiedSpreadsheet == null ) {
+		    userModifiedSpreadsheet = new UserModifiedSpreadsheet();
+		}
+		String code = WebUtil.readStrParam(request, SpreadsheetConstants.ATTR_CODE);
+		userModifiedSpreadsheet.setUserModifiedSpreadsheet(code);
+		spreadsheetUser.setUserModifiedSpreadsheet(userModifiedSpreadsheet);
+		service.saveOrUpdateUser(spreadsheetUser);
+	    } 
 	}
 
 	String typeOfAction = WebUtil.readStrParam(request, "typeOfAction");
Index: lams_tool_spreadsheet/web/pages/learning/learning.jsp
===================================================================
diff -u -r19a48bf35052a72202cc4867e68d5666f0d05898 -rca10d5f847158b365d5dec170b298f29a9b2ace7
--- lams_tool_spreadsheet/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 19a48bf35052a72202cc4867e68d5666f0d05898)
+++ lams_tool_spreadsheet/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision ca10d5f847158b365d5dec170b298f29a9b2ace7)
@@ -51,6 +51,12 @@
 				</c:choose>
 			</lams:Alert>
 		</c:if>
+		<c:if test="${userIsMarked && !(sessionMap.lockOnFinish and mode != 'teacher' && sessionMap.userFinished)}">
+			<lams:Alert type="info" id="lockWhenFinished" close="false">
+				<fmt:message key="message.spreadsheet.marked" />
+			</lams:Alert>
+		</c:if>
+		
 
 		<%@ include file="/common/messages.jsp"%>
 		
@@ -109,7 +115,7 @@
 						scrolling="no">
 						</iframe>
 				
-					<c:if test="${(mode != 'teacher') && (spreadsheet.learnerAllowedToSave) && !(sessionMap.lockOnFinish && sessionMap.userFinished)}">
+					<c:if test="${!userIsMarked && (mode != 'teacher') && (spreadsheet.learnerAllowedToSave) && !(sessionMap.lockOnFinish && sessionMap.userFinished)}">
 						<div class="space-bottom-top align-right">
 							<html:button property="SaveButton" onclick="return saveUserSpreadsheet('saveUserSpreadsheet')" styleClass="btn btn-primary voffset10 pull-right">
 								<fmt:message key="label.save" />