diff --git a/src/sentry/templates/sentry/organization-auth-provider-settings.html b/src/sentry/templates/sentry/organization-auth-provider-settings.html
index 630fdd2341db4c..bfcd18889d5b81 100644
--- a/src/sentry/templates/sentry/organization-auth-provider-settings.html
+++ b/src/sentry/templates/sentry/organization-auth-provider-settings.html
@@ -33,12 +33,20 @@ <h3>{{ provider_name }} Authentication</h3>
         {% if pending_links_count %}
           <legend>Unlinked Members</legend>
 
+          {% if require_link %}
           <p>
             There are currently {{ pending_links_count }} member(s) who have
             not yet linked their account with {{ provider_name }}. Until this
             is done they will be unable to access the organization.
-
           </p>
+          {% else %}
+          <p>
+            There are currently {{ pending_links_count }} member(s) who have
+            not yet linked their account with {{ provider_name }}. They can
+            still access the organization using their email and password, but
+            will not be able to log in via {{ provider_name }} until linked.
+          </p>
+          {% endif %}
 
           <p>
             <button class="btn btn-primary" name="op" value="reinvite">Send Reminders</button>
diff --git a/src/sentry/web/frontend/organization_auth_settings.py b/src/sentry/web/frontend/organization_auth_settings.py
index dbf55d84f4e986..ec7d7048af3c99 100644
--- a/src/sentry/web/frontend/organization_auth_settings.py
+++ b/src/sentry/web/frontend/organization_auth_settings.py
@@ -236,6 +236,7 @@ def handle_existing_provider(
             ),
             "auth_provider": auth_provider,
             "provider_name": provider.name,
+            "require_link": not auth_provider.flags.allow_unlinked,
             "scim_token_display": scim_token_display,
             "scim_url": get_scim_url(auth_provider, organization),
             "content": response,