diff --git a/ui/admin/app/components/form/account/index.hbs b/ui/admin/app/components/form/account/index.hbs
new file mode 100644
index 000000000..baf4e23fd
--- /dev/null
+++ b/ui/admin/app/components/form/account/index.hbs
@@ -0,0 +1,8 @@
+{{#if @model.type}}
+  {{component
+    (concat 'form/account/' @model.type)
+    model=@model
+    submit=@submit
+    cancel=@cancel
+  }}
+{{/if}}
\ No newline at end of file
diff --git a/ui/admin/app/components/form/account/oidc/index.hbs b/ui/admin/app/components/form/account/oidc/index.hbs
new file mode 100644
index 000000000..b3a2dd8a7
--- /dev/null
+++ b/ui/admin/app/components/form/account/oidc/index.hbs
@@ -0,0 +1,127 @@
+<Rose::Form
+  @onSubmit={{@submit}}
+  @cancel={{@cancel}}
+  @disabled={{@model.isSaving}}
+  @error={{@model.errors.base}}
+  @showEditToggle={{if @model.isNew false true}}
+  as |form|
+>
+  <form.input
+    @value={{@model.type}}
+    @label={{t 'form.type.label'}}
+    readonly={{true}}
+    @disabled={{true}}
+  />
+
+  {{#unless @model.isNew}}
+    <form.input
+      @value={{@model.attributes.issuer}}
+      @label={{t 'form.issuer.label'}}
+      readonly={{true}}
+      @disabled={{true}}
+    />
+    <form.input
+      @value={{@model.attributes.subject}}
+      @label={{t 'form.subject.label'}}
+      readonly={{true}}
+      @disabled={{true}}
+    />
+    <form.input
+      @value={{@model.attributes.email}}
+      @label={{t 'form.email.label'}}
+      readonly={{true}}
+      @disabled={{true}}
+    />
+    <form.input
+      @value={{@model.attributes.full_name}}
+      @label={{t 'form.full_name.label'}}
+      readonly={{true}}
+      @disabled={{true}}
+    />
+  {{/unless}}
+
+  <form.input
+    @name='name'
+    @type='name'
+    @value={{@model.name}}
+    @label={{t 'form.name.label'}}
+    @helperText={{t 'form.name.help'}}
+    @error={{@model.errors.name}}
+    readonly={{false}}
+    as |field|
+  >
+    {{#if @model.errors.name}}
+      <field.errors as |errors|>
+        {{#each @model.errors.name as |error|}}
+          <errors.message>{{error.message}}</errors.message>
+        {{/each}}
+      </field.errors>
+    {{/if}}
+  </form.input>
+
+  <form.textarea
+    @name='description'
+    @type='description'
+    @value={{@model.description}}
+    @label={{t 'form.description.label'}}
+    @helperText={{t 'form.description.help'}}
+    @error={{@model.errors.description}}
+    disabled={{@model.isSaving}}
+    readonly={{false}}
+    as |field|
+  >
+    {{#if @model.errors.description}}
+      <field.errors as |errors|>
+        {{#each @model.errors.description as |error|}}
+          <errors.message>{{error.message}}</errors.message>
+        {{/each}}
+      </field.errors>
+    {{/if}}
+  </form.textarea>
+
+  {{#if @model.isNew}}
+    <form.input
+      @name='issuer'
+      @type='text'
+      @value={{@model.attributes.issuer}}
+      @label={{t 'form.issuer.label'}}
+      @error={{@model.errors.issuer}}
+      readonly={{false}}
+      as |field|
+    >
+      {{#if @model.errors.issuer}}
+        <field.errors as |errors|>
+          {{#each @model.errors.issuer as |error|}}
+            <errors.message>{{error.message}}</errors.message>
+          {{/each}}
+        </field.errors>
+      {{/if}}
+    </form.input>
+
+    <form.input
+      @name='subject'
+      @type='text'
+      @value={{@model.attributes.subject}}
+      @label={{t 'form.subject.label'}}
+      @error={{@model.errors.subject}}
+      readonly={{false}}
+      as |field|
+    >
+      {{#if @model.errors.subject}}
+        <field.errors as |errors|>
+          {{#each @model.errors.subject as |error|}}
+            <errors.message>{{error.message}}</errors.message>
+          {{/each}}
+        </field.errors>
+      {{/if}}
+    </form.input>
+  {{/if}}
+
+  <form.actions
+    @disabled={{if @model.cannotSave @model.cannotSave}}
+    @enableEditText={{t 'actions.edit-form'}}
+    @submitText={{t 'actions.save'}}
+    @cancelText={{t 'actions.cancel'}}
+  />
+
+</Rose::Form>
\ No newline at end of file
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/new.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/new.js
index 20062c03e..2d31bd683 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/new.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/new.js
@@ -8,11 +8,11 @@ export default class ScopesScopeAuthMethodsAuthMethodAccountsNewRoute extends Ro
    * @return {AccountModel}
    */
   model() {
-    const { id: auth_method_id } = this.modelFor(
+    const { id: auth_method_id, type } = this.modelFor(
       'scopes.scope.auth-methods.auth-method'
     );
     return this.store.createRecord('account', {
-      type: 'password',
+      type,
       auth_method_id,
     });
   }
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs
index 1ae2b32b3..2d6e7d9a9 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs
@@ -53,23 +53,12 @@
       </dropdown.button>
     {{/if}}
   {{/if}}
-  {{#if @model.isOIDC}}
-    {{#if (feature-flag 'oidc-account-crud')}}
-      <dropdown.link
-        @route='scopes.scope.auth-methods.auth-method.accounts.new'
-        @model={{@model}}
-      >
-        {{t 'resources.account.actions.create'}}
-      </dropdown.link>
-    {{/if}}
-  {{else}}
-    <dropdown.link
-      @route='scopes.scope.auth-methods.auth-method.accounts.new'
-      @model={{@model}}
-    >
-      {{t 'resources.account.actions.create'}}
-    </dropdown.link>
-  {{/if}}
+  <dropdown.link
+    @route='scopes.scope.auth-methods.auth-method.accounts.new'
+    @model={{@model}}
+  >
+    {{t 'resources.account.actions.create'}}
+  </dropdown.link>
   <dropdown.separator />
   <dropdown.button
     @style='danger'
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-navigation.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-navigation.hbs
index a1f9d1fda..da08d1834 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-navigation.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-navigation.hbs
@@ -4,9 +4,11 @@
   >
     {{t 'titles.details'}}
   </nav.link>
-  <nav.link
-    @route='scopes.scope.auth-methods.auth-method.accounts.account.set-password'
-  >
-    {{t 'actions.set-password'}}
-  </nav.link>
+  {{#if @model.isPassword}}
+    <nav.link
+      @route='scopes.scope.auth-methods.auth-method.accounts.account.set-password'
+    >
+      {{t 'actions.set-password'}}
+    </nav.link>
+  {{/if}}
 </Rose::Nav::Tabs>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/index.hbs
index 118fea9a8..e20c46a14 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/index.hbs
@@ -1,4 +1,4 @@
-<Form::Account::Password
+<Form::Account
   @model={{@model}}
   @submit={{route-action 'save' @model}}
   @cancel={{route-action 'cancel' @model}}
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/new.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/new.hbs
index 118fea9a8..e20c46a14 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/new.hbs
@@ -1,4 +1,4 @@
-<Form::Account::Password
+<Form::Account
   @model={{@model}}
   @submit={{route-action 'save' @model}}
   @cancel={{route-action 'cancel' @model}}
diff --git a/ui/admin/config/environment.js b/ui/admin/config/environment.js
index 1e9db7322..6738189de 100644
--- a/ui/admin/config/environment.js
+++ b/ui/admin/config/environment.js
@@ -89,7 +89,7 @@ module.exports = function (environment) {
       'primary-auth-method': true,
       oidc: true,
       'oidc-crud': true,
-      'oidc-account-crud': false,
+      'oidc-account-crud': true,
       search: false,
       filter: false,
       capabilities: false,