Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -r6dc5dd81f61c7d41ce4983cc23eda350305a346e -rbb3e2d4102e49e02c5b775e26eee1e23c78afcca
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 6dc5dd81f61c7d41ce4983cc23eda350305a346e)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision bb3e2d4102e49e02c5b775e26eee1e23c78afcca)
@@ -767,7 +767,7 @@
 
 	    // can share the mark file across users
 	    NodeKey nodeKey = null;
-	    if ((markFile != null) && !StringUtils.isEmpty(markFile.getName())) {
+	    if ((markFile != null) && !StringUtils.isEmpty(markFile.getOriginalFilename())) {
 		nodeKey = this.processFile(markFile);
 	    }
 
@@ -791,7 +791,7 @@
 			    report.setMarkFileVersionID(null);
 			}
 
-			report.setMarkFileName(markFile.getName());
+			report.setMarkFileName(markFile.getOriginalFilename());
 			report.setMarkFileUUID(nodeKey.getUuid());
 			report.setMarkFileVersionID(nodeKey.getVersion());
 		    }
@@ -809,7 +809,7 @@
 		report.setMarks(marks);
 
 		// If there is a new file, delete the existing and add the mark file
-		if ((markFile != null) && !StringUtils.isEmpty(markFile.getName())) {
+		if ((markFile != null) && !StringUtils.isEmpty(markFile.getOriginalFilename())) {
 
 		    // Delete the existing
 		    if (report.getMarkFileUUID() != null) {
@@ -824,7 +824,7 @@
 		    // NodeKey nodeKey = toolContentHandler.uploadFile(marksFileInputStream, marksFileName, null,
 		    // IToolContentHandler.TYPE_ONLINE);
 
-		    report.setMarkFileName(markFile.getName());
+		    report.setMarkFileName(markFile.getOriginalFilename());
 		    report.setMarkFileUUID(nodeKey.getUuid());
 		    report.setMarkFileVersionID(nodeKey.getVersion());
 		}
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MarkController.java
===================================================================
diff -u -r0846a8d71b94a193280999c0576aa7512c2fca9d -rbb3e2d4102e49e02c5b775e26eee1e23c78afcca
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MarkController.java	(.../MarkController.java)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MarkController.java	(.../MarkController.java)	(revision bb3e2d4102e49e02c5b775e26eee1e23c78afcca)
@@ -145,7 +145,7 @@
      * Update the form
      */
     @RequestMapping("/updateMarkForm")
-    private void updateMarkForm(MarkForm markForm, FileDetailsDTO fileDetailsDTO) {
+    private void updateMarkForm(@ModelAttribute MarkForm markForm, FileDetailsDTO fileDetailsDTO) {
 
 	if (fileDetailsDTO.getMarks() != null) {
 	    markForm.setMarks(fileDetailsDTO.getMarks().toString());