Index: site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
===================================================================
--- site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java	(revision 103598)
+++ site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java	(working copy)
@@ -2706,6 +2706,12 @@
 			 * .getAttribute(STATE_INSTRUCTOR_SELECTED));
 			 */
 			
+			// Added by bjones86 - determine to omit course section link in worksite setup
+			if( "true".equalsIgnoreCase( ServerConfigurationService.getString( "worksiteSetup.omitCourseSectionLink" ) ) )
+				context.put( "omitCourseSectionLink", Boolean.TRUE );
+			else
+				context.put( "omitCourseSectionLink", Boolean.FALSE );
+			
 			context.put("basedOnTemplate",  state.getAttribute(STATE_TEMPLATE_SITE) != null ? Boolean.TRUE:Boolean.FALSE);
 			
 			return (String) getContext(data).get("template") + TEMPLATE[36];
@@ -3021,6 +3027,12 @@
 			context.put("value_uniqname", state.getAttribute(STATE_SITE_QUEST_UNIQNAME));
 			context.put("basedOnTemplate",  state.getAttribute(STATE_TEMPLATE_SITE) != null ? Boolean.TRUE:Boolean.FALSE);
 
+			// Added by bjones86 - determine to omit site create link in worksite setup
+			if( "true".equalsIgnoreCase( ServerConfigurationService.getString( "worksiteSetup.omitSiteCreateLink" ) ) )
+				context.put( "omitSiteCreateLink", Boolean.TRUE );
+			else
+				context.put( "omitSiteCreateLink", Boolean.FALSE );
+			
 			return (String) getContext(data).get("template") + TEMPLATE[53];
 		}
 		case 54:
Index: site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteCourse.vm
===================================================================
--- site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteCourse.vm	(revision 103598)
+++ site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteCourse.vm	(working copy)
@@ -333,8 +333,13 @@
 		<input type="hidden" name="option" id="option" value="x" />
 		<input type="hidden" name="eventSubmit_doContinue_new_course" value="x" />
 			#if (!$site)
-				<!-- Add Not Listed Courses -->
-				<a href="#" onclick="javascript:submitFindCourse();">$tlang.getString('nscourse.add_course_not_listed')</a>
+				
+				## Added by bjones86 - determine to omit course section link in worksite setup
+				#if( !$omitCourseSectionLink )
+					<!-- Add Not Listed Courses -->
+					<a href="#" onclick="javascript:submitFindCourse();">$tlang.getString('nscourse.add_course_not_listed')</a>
+				#end
+				
 				## if site creation is based on template, this could be the final step!
 				#if ($!basedOnTemplate) 
 					<div class="instruction" id ="nextInstructions">
@@ -379,8 +384,13 @@
 					<span id="submitnotif" style="visibility:hidden">$tlang.getString("gen.proces")</span>
 				</p>
 			#else
-				<!-- Add Not Listed Courses -->
-				<a href="#" onclick="javascript:submitFindCourse();">$tlang.getString('nscourse.add_course_not_listed')</a>
+				
+				## Added by bjones86 - determine to omit course section link in worksite setup
+				#if( !$omitCourseSectionLink )
+					<!-- Add Not Listed Courses -->
+ 					<a href="#" onclick="javascript:submitFindCourse();">$tlang.getString('nscourse.add_course_not_listed')</a>
+				#end
+				
 				<p class="act">
 				<input type="hidden" name="option" id="option" value="x" />
 				<input
Index: site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-findCourse.vm
===================================================================
--- site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-findCourse.vm	(revision 103598)
+++ site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-findCourse.vm	(working copy)
@@ -211,11 +211,16 @@
 			</div>
 			<br />
 			<!-- end loop through fields-->
-		 <p>
+		 
+		## Added by bjones86 - determine to omit site create link in worksite setup
+		#if( !$omitSiteCreateLink )
+			<p>
 				<a href="#" onclick="javascript:blur();document.findCourseForm.option.value='manual';document.findCourseForm.submit();">
 					$tlang.getString("nscourse.findCourse.stillNotFound")
 				</a>
 			</p>
+		#end
+		 
 		<input type="hidden" name="back" value="$!backIndex" />
 		<input id="index" type="hidden" name="templateIndex" value="$!templateIndex" />
 		<input type="hidden" name="eventSubmit_doFind_course" value="x" />