Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/select/SelectAssessmentBean.java
===================================================================
--- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/select/SelectAssessmentBean.java	(revision 89919)
+++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/select/SelectAssessmentBean.java	(working copy)
@@ -25,6 +25,8 @@
 
 import java.util.ArrayList;
 
+import org.sakaiproject.component.cover.ServerConfigurationService;
+
 /**
  * @author <a href="mailto:lance@indiana.edu">Lance Speelmon</a>
  * @version $Id$
@@ -49,6 +51,7 @@
 	private org.sakaiproject.tool.assessment.ui.model.PagingModel takePager;
 	private boolean hasHighestMultipleSubmission = false;  // this is used to display the message on the bottom if there are any highest multiple submissions. 
 	private boolean hasAnyAssessmentBeenModified = false;  // this is used to display the message on the bottom if there is any assessment been modified after submitted.
+	private Boolean warnUserOfModification;
 	private boolean hasAnyAssessmentRetractForEdit = false;  // this is used to display the message on the bottom if there is any assessment retracted for edit.
 	private String displayAllAssessments = "2"; // display all
 	private boolean hasAverageMultipleSubmissions=false;
@@ -291,5 +294,16 @@
 	 */
 	public void setHasAverageMultipleSubmissions(boolean hasAverageMultipleSubmissions) {
 		this.hasAverageMultipleSubmissions = hasAverageMultipleSubmissions;
+	}
+
+	public Boolean getWarnUserOfModification() {
+		if(warnUserOfModification == null){
+			warnUserOfModification = ServerConfigurationService.getBoolean("samigo.SelectAssessmentBean.warnUserOfModification", true);
+		}
+		return warnUserOfModification;
+	}
+
+	public void setWarnUserOfModification(Boolean warnUserOfModification) {
+		this.warnUserOfModification = warnUserOfModification;
 	}       
 }
Index: samigo-app/src/webapp/jsf/select/selectIndex.jsp
===================================================================
--- samigo-app/src/webapp/jsf/select/selectIndex.jsp	(revision 89919)
+++ samigo-app/src/webapp/jsf/select/selectIndex.jsp	(working copy)
@@ -271,7 +271,7 @@
       </f:facet>
 	
 	<h:outputText value="#{reviewable.assessmentTitle}" styleClass="currentSort"  rendered="#{reviewable.isRecordedAssessment}"  escape="false"/>
-	<h:outputText value="#{selectIndexMessages.asterisk}" rendered="#{reviewable.isRecordedAssessment && reviewable.feedback == 'show' && !reviewable.isAssessmentRetractForEdit && reviewable.hasAssessmentBeenModified}" styleClass="validate"/> 
+	<h:outputText value="#{selectIndexMessages.asterisk}" rendered="#{reviewable.isRecordedAssessment && reviewable.feedback == 'show' && !reviewable.isAssessmentRetractForEdit && reviewable.hasAssessmentBeenModified && select.warnUserOfModification}" styleClass="validate"/> 
 	<h:outputText value="#{selectIndexMessages.asterisk_2}" rendered="#{reviewable.isRecordedAssessment && reviewable.isAssessmentRetractForEdit}" styleClass="validate" />
 	
    </h:column>
@@ -385,7 +385,7 @@
   <f:verbatim><br/></f:verbatim>
   
   <h:panelGrid>
-  <h:outputText value="#{selectIndexMessages.asterisk} #{selectIndexMessages.has_been_modified}" rendered="#{select.hasAnyAssessmentBeenModified}" styleClass="validate"/> 
+  <h:outputText value="#{selectIndexMessages.asterisk} #{selectIndexMessages.has_been_modified}" rendered="#{select.hasAnyAssessmentBeenModified && select.warnUserOfModification}" styleClass="validate"/> 
   <h:outputText value="#{selectIndexMessages.asterisk_2} #{selectIndexMessages.currently_being_edited}" rendered="#{select.hasAnyAssessmentRetractForEdit}" styleClass="validate"/>
   </h:panelGrid>