diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-navigation.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-navigation.hbs
index 568445801..2694041c8 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-navigation.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-navigation.hbs
@@ -2,7 +2,15 @@
   <nav.link @route='scopes.scope.auth-methods.auth-method.index'>
     {{t 'titles.details'}}
   </nav.link>
-  <nav.link @route='scopes.scope.auth-methods.auth-method.accounts'>
-    {{t 'resources.account.title_plural'}}
-  </nav.link>
+  {{#if @model.isOIDC}}
+    {{#if (feature-flag 'oidc-account-crud')}}
+      <nav.link @route='scopes.scope.auth-methods.auth-method.accounts'>
+        {{t 'resources.account.title_plural'}}
+      </nav.link>
+    {{/if}}
+  {{else}}
+    <nav.link @route='scopes.scope.auth-methods.auth-method.accounts'>
+      {{t 'resources.account.title_plural'}}
+    </nav.link>
+  {{/if}}
 </Rose::Nav::Tabs>
\ No newline at end of file
diff --git a/ui/admin/config/environment.js b/ui/admin/config/environment.js
index 21d1e3da6..1e9db7322 100644
--- a/ui/admin/config/environment.js
+++ b/ui/admin/config/environment.js
@@ -88,7 +88,8 @@ module.exports = function (environment) {
     featureFlags: {
       'primary-auth-method': true,
       oidc: true,
-      'oidc-crud': false,
+      'oidc-crud': true,
+      'oidc-account-crud': false,
       search: false,
       filter: false,
       capabilities: false,
@@ -131,6 +132,7 @@ module.exports = function (environment) {
     ENV.featureFlags['primary-auth-method'] = true;
     ENV.featureFlags['oidc'] = true;
     ENV.featureFlags['oidc-crud'] = true;
+    //ENV.featureFlags['oidc-account-crud'] = true;
   }
 
   if (environment === 'test') {