diff --git a/comprehensive/lms/templates/courseware/course_about.html b/comprehensive/lms/templates/courseware/course_about.html
index af66cb9..31404f8 100644
--- a/comprehensive/lms/templates/courseware/course_about.html
+++ b/comprehensive/lms/templates/courseware/course_about.html
@@ -12,7 +12,7 @@ from openedx.core.djangoapps.site_configuration import helpers as configuration_
 <%
    my_course_org_filter = configuration_helpers.get_value('course_org_filter')
 %>
-% if my_course_org_filter == course.display_org_with_default:
+% if course.display_org_with_default in my_course_org_filter:
 <%block name="headextra">
   ## OG (Open Graph) title and description added below to give social media info to display
   ## (https://developers.facebook.com/docs/opengraph/howtos/maximizing-distribution-media-content#tags)
diff --git a/comprehensive/lms/templates/courseware/courseware.html b/comprehensive/lms/templates/courseware/courseware.html
index 8ff0698..d5d4cbf 100644
--- a/comprehensive/lms/templates/courseware/courseware.html
+++ b/comprehensive/lms/templates/courseware/courseware.html
@@ -14,7 +14,7 @@ from openedx.core.djangoapps.site_configuration import helpers as configuration_
 <%
    my_course_org_filter = configuration_helpers.get_value('course_org_filter')
 %>
-% if my_course_org_filter == course.display_org_with_default:
+% if course.display_org_with_default in my_course_org_filter:
 <%
   include_special_exams = settings.FEATURES.get('ENABLE_SPECIAL_EXAMS', False) and (course.enable_proctored_exams or course.enable_timed_exams)
 %>
diff --git a/comprehensive/lms/templates/courseware/info.html b/comprehensive/lms/templates/courseware/info.html
index 1ba6b3d..5508f93 100644
--- a/comprehensive/lms/templates/courseware/info.html
+++ b/comprehensive/lms/templates/courseware/info.html
@@ -16,7 +16,7 @@ from openedx.core.djangoapps.site_configuration import helpers as configuration_
 <%
    my_course_org_filter = configuration_helpers.get_value('course_org_filter')
 %>
-% if my_course_org_filter == course.display_org_with_default:
+% if course.display_org_with_default in my_course_org_filter:
 <%block name="pagetitle">${_("{course_number} Course Info").format(course_number=course.display_number_with_default)}</%block>
 
 <%block name="headextra">
diff --git a/courses/lms/templates/courseware/course_about.html b/courses/lms/templates/courseware/course_about.html
index 978f1c0..72e0720 100644
--- a/courses/lms/templates/courseware/course_about.html
+++ b/courses/lms/templates/courseware/course_about.html
@@ -12,7 +12,7 @@ from openedx.core.djangoapps.site_configuration import helpers as configuration_
 <%
    my_course_org_filter = configuration_helpers.get_value('course_org_filter')
 %>
-% if my_course_org_filter == course.display_org_with_default and user.is_authenticated():
+% if course.display_org_with_default in my_course_org_filter and user.is_authenticated():
 <%block name="headextra">
   ## OG (Open Graph) title and description added below to give social media info to display
   ## (https://developers.facebook.com/docs/opengraph/howtos/maximizing-distribution-media-content#tags)
diff --git a/courses/lms/templates/courseware/courseware.html b/courses/lms/templates/courseware/courseware.html
index 600caf1..4632d56 100644
--- a/courses/lms/templates/courseware/courseware.html
+++ b/courses/lms/templates/courseware/courseware.html
@@ -14,7 +14,7 @@ from openedx.core.djangoapps.site_configuration import helpers as configuration_
 <%
    my_course_org_filter = configuration_helpers.get_value('course_org_filter')
 %>
-% if my_course_org_filter == course.display_org_with_default:
+% if course.display_org_with_default in my_course_org_filter and user.is_authenticated():
 <%
   include_special_exams = settings.FEATURES.get('ENABLE_SPECIAL_EXAMS', False) and (course.enable_proctored_exams or course.enable_timed_exams)
 %>
diff --git a/courses/lms/templates/courseware/info.html b/courses/lms/templates/courseware/info.html
index f17b359..1e35649 100644
--- a/courses/lms/templates/courseware/info.html
+++ b/courses/lms/templates/courseware/info.html
@@ -16,7 +16,7 @@ from openedx.core.djangoapps.site_configuration import helpers as configuration_
 <%
    my_course_org_filter = configuration_helpers.get_value('course_org_filter')
 %>
-% if my_course_org_filter == course.display_org_with_default and user.is_authenticated():
+% if course.display_org_with_default in my_course_org_filter and user.is_authenticated():
 <%block name="pagetitle">${_("{course_number} Course Info").format(course_number=course.display_number_with_default)}</%block>
 
 <%block name="headextra">