diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
index 039602e23..f8038c37b 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
@@ -58,15 +58,29 @@
           {{#each @model as |authMethod|}}
             <body.row as |row|>
               <row.headerCell>
-                {{#if authMethod.isPassword}}
+                {{!
+                  Show link to auth method route if non-OIDC and when
+                  oidc-crud feature is enabled, otherwise show just the name
+                  (when the method is OIDC and oidc-crud is disabled)
+                }}
+                {{#if authMethod.isOIDC}}
+                  {{#if (feature-flag 'oidc-crud')}}
+                    <LinkTo
+                      @route="scopes.scope.auth-methods.auth-method"
+                      @model={{authMethod.id}}
+                    >
+                      {{authMethod.displayName}}
+                    </LinkTo>
+                  {{else}}
+                    {{authMethod.displayName}}
+                  {{/if}}
+                {{else}}
                   <LinkTo
                     @route="scopes.scope.auth-methods.auth-method"
                     @model={{authMethod.id}}
                   >
                     {{authMethod.displayName}}
                   </LinkTo>
-                {{else}}
-                  {{authMethod.displayName}}
                 {{/if}}
                 <p>{{authMethod.description}}</p>
               </row.headerCell>
diff --git a/ui/admin/config/environment.js b/ui/admin/config/environment.js
index 1f1d8de4c..cfbcb155b 100644
--- a/ui/admin/config/environment.js
+++ b/ui/admin/config/environment.js
@@ -87,6 +87,7 @@ module.exports = function (environment) {
 
     featureFlags: {
       oidc: false,
+      'oidc-crud': false,
       'primary-auth-method': false,
     },
   };
@@ -125,6 +126,7 @@ module.exports = function (environment) {
     // Enable features in development
     ENV.featureFlags['primary-auth-method'] = true;
     ENV.featureFlags['oidc'] = true;
+    //ENV.featureFlags['oidc-crud'] = true;
   }
 
   if (environment === 'test') {