diff --git a/config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties b/config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties
index 7799f9f8a7f5..3d58331c6434 100644
--- a/config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties
+++ b/config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties
@@ -1398,6 +1398,10 @@
 # DEFAULT: true
 # site-manage.pageorder.allowreorder=false
 
+# SAK-28990 Disable 'Continue with no roster' button during course site creation
+# DEFAULT: true
+# sitemanage.continueWithNoRoster=false
+
 # ########################################################################
 # GROUP PROVIDER (defined in kernel.properties)
 # ########################################################################
diff --git a/site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java b/site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
index de0279a717f2..66eefdc93936 100644
--- a/site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
+++ b/site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
@@ -788,6 +788,10 @@ public class SiteAction extends PagedResourceActionII {
 	private static UserAuditService userAuditService = (UserAuditService) ComponentManager.get(UserAuditService.class);
 	
 	private PrivacyManager privacyManager = (PrivacyManager) ComponentManager.get(PrivacyManager.class);
+	
+	// SAK-28990 - enable/disable continue with no roster
+	private static final String VM_CONT_NO_ROSTER_ENABLED = "contNoRosterEnabled";
+	private static final String SAK_PROP_CONT_NO_ROSTER_ENABLED = "sitemanage.continueWithNoRoster";
 
 	/**
 	 * what are the tool ids within Home page?
@@ -3181,6 +3185,16 @@ public int compare(JoinableGroup g1, JoinableGroup g2){
 			
 			context.put("siteType", state.getAttribute(STATE_TYPE_SELECTED));
 			
+			// SAK-28990 remove continue with no roster
+			if( "true".equalsIgnoreCase( ServerConfigurationService.getString( SAK_PROP_CONT_NO_ROSTER_ENABLED, "true" ) ) )
+			{
+				context.put( VM_CONT_NO_ROSTER_ENABLED, Boolean.TRUE );
+			}
+			else
+			{
+				context.put( VM_CONT_NO_ROSTER_ENABLED, Boolean.FALSE);
+			}
+			
 			return (String) getContext(data).get("template") + TEMPLATE[36];
 		case 37:
 			/*
diff --git a/site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteCourse.vm b/site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteCourse.vm
index e61c0381a582..003cdcad475c 100644
--- a/site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteCourse.vm
+++ b/site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteCourse.vm
@@ -374,6 +374,8 @@ function redirectBasedOnSelection(){
 					value="$tlang.getString('gen.cancel')"
 					onclick="document.addCourseForm.option.value='cancel'; document.addCourseForm.submit(); return false;"
 					/>
+				## SAK-28990 controlled via sakai.property sitemanage.continueWithNoRoster.enabled
+				#if( $!contNoRosterEnabled )
 				<input
 					type="button" 
 					accesskey="x"
@@ -382,6 +384,7 @@ function redirectBasedOnSelection(){
 					value="$tlang.getString('nscourse.no_rosters')"
 					onclick="document.addCourseForm.option.value='norosters'; document.addCourseForm.submit(); return false;"
 					/>
+				#end
 					<span id="submitnotif" style="visibility:hidden">$tlang.getString("gen.proces")</span>
 				</p>
 			#else