Index: assignment/assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
===================================================================
--- assignment/assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java	(revision 315337)
+++ assignment/assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java	(working copy)
@@ -889,6 +889,9 @@
 	
 	/** SAK-17606 - Property for whether an assignment user anonymous grading (user settable). */
 	private static final String NEW_ASSIGNMENT_CHECK_ANONYMOUS_GRADING = "new_assignment_check_anonymous_grading";
+
+	/** Sakai.property for enable/disable anonymous grading */
+	private static final String SAK_PROP_ENABLE_ANON_GRADING = "assignment.anon.grading.enabled";
 	
 	private AssignmentPeerAssessmentService assignmentPeerAssessmentService;
 	public void setAssignmentPeerAssessmentService(AssignmentPeerAssessmentService assignmentPeerAssessmentService){
@@ -2315,6 +2318,9 @@
 		state.removeAttribute(CALENDAR_TOOL_EXIST);
 		state.removeAttribute(ADDITIONAL_CALENDAR_TOOL_READY);
 		initState(state, portlet, (JetspeedRunData)data);
+
+		// Anon grading enabled/disabled
+		context.put( "enableAnonGrading", ServerConfigurationService.getBoolean( SAK_PROP_ENABLE_ANON_GRADING, false ) );
 		
 		// is the assignment an new assignment
 		String assignmentId = (String) state.getAttribute(EDIT_ASSIGNMENT_ID);
Index: assignment/assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_new_edit_assignment.vm
===================================================================
--- assignment/assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_new_edit_assignment.vm	(revision 315337)
+++ assignment/assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_new_edit_assignment.vm	(working copy)
@@ -969,20 +969,25 @@
 			#end
 		#end
 
-		## SAK-17606 - Show the anonymous grading checkbox
-		#if ($withGrade && $withGradebook)
-			<br />
+		## SAK-17606 - Show the anonymous grading checkbox if enabled
+		#if( $enableAnonGrading || $value_CheckAnonymousGrading.equals("true") )
+			#if ($withGrade && $withGradebook)
+				<br />
+			#end
+			<p class="checkbox indnt2">
+				<input id="$name_CheckAnonymousGrading" name="$name_CheckAnonymousGrading" type="checkbox" value="true" 
+					#if ($value_CheckAnonymousGrading.equals("true"))
+						checked="checked"
+					#end
+					#if( !$enableAnonGrading )
+						disabled="disabled"
+					#end
+				/>
+			<label for="$name_CheckAnonymousGrading" #if( !$enableAnonGrading ) class="disabled" #end>
+				$tlang.getString("grading.anonymous") 
+			</label>
+			</p>
 		#end
-		<p class="checkbox indnt2">
-		#if ($value_CheckAnonymousGrading.equals("true"))
-			<input id="$name_CheckAnonymousGrading" name="$name_CheckAnonymousGrading" type="checkbox" value="true" checked="checked" />
-		#else
-			<input id="$name_CheckAnonymousGrading" name="$name_CheckAnonymousGrading" type="checkbox" value="true" />
-		#end
-		<label for="$name_CheckAnonymousGrading">
-		$tlang.getString("grading.anonymous") 
-		</label>
-		</p>
 		## end anonymous check
 
 		## Peer Assessment
Index: config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties
===================================================================
--- config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties	(revision 315336)
+++ config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties	(working copy)
@@ -1617,6 +1617,9 @@
 # Default: false
 #assignment.download.flat=true
 
+# Enable anonymous grading for assignments (default is false)
+# assignment.anon.grading.enabled=false
+
 # If set to any value, no calendar will ever be returned/used by the calendar service
 # DEFAULT: none (null) - will try to reference the calendar for the context
 # calendar=