diff --git a/ui/admin/app/components/form/auth-method/index.hbs b/ui/admin/app/components/form/auth-method/index.hbs
index 048be9d25..77cf37d4d 100644
--- a/ui/admin/app/components/form/auth-method/index.hbs
+++ b/ui/admin/app/components/form/auth-method/index.hbs
@@ -6,5 +6,6 @@
     cancel=@cancel
     removeItemByIndex=@removeItemByIndex
     addStringItem=@addStringItem
+    addAccountClaimMapItem=@addAccountClaimMapItem
   }}
 {{/if}}
\ No newline at end of file
diff --git a/ui/admin/app/components/form/auth-method/oidc/index.hbs b/ui/admin/app/components/form/auth-method/oidc/index.hbs
index 8b82c6467..335392e08 100644
--- a/ui/admin/app/components/form/auth-method/oidc/index.hbs
+++ b/ui/admin/app/components/form/auth-method/oidc/index.hbs
@@ -472,6 +472,45 @@
               </row.cell>
             </body.row>
           {{/each}}
+
+          <body.row as |row|>
+            <row.cell>
+              <form.input
+                @type='text'
+                @value={{this.newFromClaim}}
+                @label={{t 'resources.auth-method.titles.new-from-claim'}}
+              />
+            </row.cell>
+            <row.cell>
+              <form.select
+                @value={{this.newToClaim}}
+                @label={{t 'resources.auth-method.titles.new-to-claim'}}
+                @onChange={{fn (mut this.newToClaim)}}
+                as |field|
+              >
+                <field.field as |select|>
+                  {{#each this.toClaims as |toClaim|}}
+                    <select.option
+                      @value={{toClaim}}
+                    >{{toClaim}}</select.option>
+                  {{/each}}
+                </field.field>
+              </form.select>
+            </row.cell>
+            <row.cell @shrink={{true}}>
+              <Rose::Button
+                @style='secondary'
+                title={{t 'actions.add'}}
+                @disabled={{if form.isEditable false true}}
+                {{on
+                  'click'
+                  (fn @addAccountClaimMapItem this.newFromClaim this.newToClaim)
+                }}
+              >
+                {{t 'actions.add'}}
+              </Rose::Button>
+            </row.cell>
+          </body.row>
         </table.body>
       </Rose::Table>
     </:body>
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods.js b/ui/admin/app/routes/scopes/scope/auth-methods.js
index 00666c1fb..31c0778a5 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods.js
@@ -151,7 +151,7 @@ export default class ScopesScopeAuthMethodsRoute extends Route {
 
   /**
    * Adds a string item to array `property` on the passed `authMethod`.
-   * This is used to manage entries in fragment string array fields such
+   * This is used to manage entries in fragment OIDC string array fields such
    * as `signing_algorithms`.
    * @param {AuthMethodModel} authMethod
    * @param {string} property
@@ -162,4 +162,17 @@ export default class ScopesScopeAuthMethodsRoute extends Route {
     const array = authMethod.get(property);
     array.addObject({ value });
   }
+
+  /**
+   * Adds an account claim map fragment to the passed OIDC `authMethod`.
+   * @param {AuthMethodModel} authMethod
+   * @param {string} property
+   * @param {string} value
+   */
+  @action
+  async addAccountClaimMapItem(authMethod, from, to) {
+    const array = authMethod.attributes.account_claim_maps;
+    const value = { from, to };
+    array.addObject(value);
+  }
 }
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/index.hbs
index 2c477bb7c..e3302df0b 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/index.hbs
@@ -4,4 +4,5 @@
   @cancel={{route-action 'cancel' @model}}
   @removeItemByIndex={{route-action 'removeItemByIndex' @model}}
   @addStringItem={{route-action 'addStringItem' @model}}
+  @addAccountClaimMapItem={{route-action 'addAccountClaimMapItem' @model}}
 />
\ No newline at end of file