Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SaveAssessmentSettings.java
===================================================================
--- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SaveAssessmentSettings.java	(revision 97751)
+++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SaveAssessmentSettings.java	(working copy)
@@ -155,11 +155,11 @@
 
 
     // d. set Submissions
-    if (control.getItemNavigation() != null && control.getItemNavigation().equals(Integer.valueOf(1))) {
+    /*if (control.getItemNavigation() != null && control.getItemNavigation().equals(Integer.valueOf(1))) {
     	control.setUnlimitedSubmissions(Boolean.FALSE);
     	control.setSubmissionsAllowed(Integer.valueOf("1"));
     }
-    else {
+    else {*/
     	if (assessmentSettings.getUnlimitedSubmissions()!=null){
     		if (!assessmentSettings.getUnlimitedSubmissions().
     				equals(AssessmentAccessControlIfc.UNLIMITED_SUBMISSIONS.toString())) {
@@ -175,7 +175,7 @@
     			control.setSubmissionsAllowed(null);
     		}
     	}
-    }
+    //}
     //log.info("**unlimited submission="+assessmentSettings.getUnlimitedSubmissions());
     //log.info("**allowed="+control.getSubmissionsAllowed());
 
Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SavePublishedSettingsListener.java
===================================================================
--- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SavePublishedSettingsListener.java	(revision 97751)
+++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SavePublishedSettingsListener.java	(working copy)
@@ -435,11 +435,11 @@
 	    }
 
 		// set Submissions
-		if (control.getItemNavigation() != null && control.getItemNavigation().equals(Integer.valueOf(1))) {
+		/*if (control.getItemNavigation() != null && control.getItemNavigation().equals(Integer.valueOf(1))) {
 			control.setUnlimitedSubmissions(Boolean.FALSE);
 			control.setSubmissionsAllowed(Integer.valueOf("1"));
 		}
-		else {
+		else {*/
 			if (assessmentSettings.getUnlimitedSubmissions()!=null){
 				if (!assessmentSettings.getUnlimitedSubmissions().
 						equals(AssessmentAccessControlIfc.UNLIMITED_SUBMISSIONS.toString())) {
@@ -455,7 +455,7 @@
 					control.setSubmissionsAllowed(null);
 				}
 			}
-		}
+		//}
 
 		if (assessmentSettings.getLateHandling()!=null){
 			control.setLateHandling(new Integer(assessmentSettings.