Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java,v
diff -u -r1.30 -r1.31
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	18 Feb 2013 13:17:29 -0000	1.30
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	6 Sep 2013 10:20:13 -0000	1.31
@@ -855,8 +855,9 @@
 	    ToolActivity activity = toolSession.getToolActivity();
 	    GradebookUserActivity gradebookUserActivity = getGradebookUserActivity(activity.getActivityId(), userID);
 
-	    // If gradebook user activity is null, save the mark and feedback
-	    if (gradebookUserActivity == null || !gradebookUserActivity.getMarkedInGradebook()) {
+	    // If gradebook user activity is null or the mark is set by teacher or was set previously by user - save the
+	    // mark and feedback
+	    if (gradebookUserActivity == null || markedInGradebook || !gradebookUserActivity.getMarkedInGradebook()) {
 		updateUserActivityGradebookMark(toolSession.getLesson(), learner, activity, mark, markedInGradebook);
 	    }
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java,v
diff -u -r1.116 -r1.117
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	5 Sep 2013 17:35:12 -0000	1.116
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	6 Sep 2013 10:20:30 -0000	1.117
@@ -878,7 +878,7 @@
 
 	// propagade changes to Gradebook
 	int totalMark = (oldMark == null) ? oldTotalMark + newMark : oldTotalMark - oldMark + newMark;
-	gradebookService.updateActivityMark(new Double(totalMark), null, userId, toolSessionId, false);
+	gradebookService.updateActivityMark(new Double(totalMark), null, userId, toolSessionId, true);
 
     }