diff --git a/addons/api/addon/generated/models/auth-method.js b/addons/api/addon/generated/models/auth-method.js
index b13a3fd71..36a82026a 100644
--- a/addons/api/addon/generated/models/auth-method.js
+++ b/addons/api/addon/generated/models/auth-method.js
@@ -221,6 +221,12 @@ export default class GeneratedAuthMethodModel extends BaseModel {
   })
   enable_groups;
 
+  @attr('boolean', {
+    for: 'ldap',
+    isNestedAttribute: true,
+  })
+  use_token_groups;
+
   @attr('string', {
     for: 'ldap',
     isNestedAttribute: true,
diff --git a/addons/api/mirage/generated/factories/auth-method.js b/addons/api/mirage/generated/factories/auth-method.js
index 0385f023d..67bfb4196 100644
--- a/addons/api/mirage/generated/factories/auth-method.js
+++ b/addons/api/mirage/generated/factories/auth-method.js
@@ -73,6 +73,7 @@ export default Factory.extend({
             'preferredName=fullName',
             'preferredEmail=email',
           ],
+          use_token_groups: false,
         };
         break;
     }
diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index db9086208..4d5914ab6 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -44,6 +44,8 @@ auth-method:
     new-from-claim: New From Claim
     new-to-claim: New To Claim
     new-certificate: New Certificate
+    from-attr: From Attribute
+    to-attr: To Attribute
   types:
     password: Password
     oidc: OIDC
@@ -62,6 +64,83 @@ auth-method:
     make-primary-confirm: 'A primary auth method auto-creates users on their first authentication attempt if needed.  Note:  if you change the primary auth method, the previous primary will no longer auto-create users.'
     remove-as-primary-confirm: Removing the primary auth method may lead to authentication failures for this scope.
     no-see-window: Don't see the new window?
+  form:
+    urls:
+      label: Server address (URL and port)
+      help: 'The domain name or IP address of the LDAP server. (Example: ldap.example.com:389)'
+    certificates:
+      label: Certificates
+      help: PEM encoded x509 certificates in ASN.1 DER form that can be used as trust anchors when connecting to an LDAP provider.
+    client_certificate:
+      label: Client TLS Certificate
+      help: Used to provide to the LDAP server for mTLS connections. Must be x509 PEM encoded.
+    client_certificate_key:
+      label: Client TLS Key
+      help: Used with the ClientTLSCert for mTLS connections to the LDAP server. Must be x509 PEM encoded.
+    start_tls:
+      label: Use StartTLS
+      help: Use StartTLS to create a secure connection.
+    insecure_tls:
+      label: Skip SSL Verification
+      help: Skip SSL certificate verification for LDAP server. Use with caution!
+    bind_dn:
+      label: Bind DN
+      help: Distinguished name of entry to bind when performing user and group search.
+    bind_password:
+      label: Bind Password
+      help: Password to use with BindDN when searching for user.
+    upn_domain:
+      label: UPN Domain
+      help: Add this domain to the username when authenticating.
+    discover_dn:
+      label: Discover DN
+      help: Use anonymous bind to discover the bind DN of a user.
+    anon_group_search:
+      label: Anonymous Group Search
+      help: Use anonymous binds when searching for LDAP groups.
+    user_dn:
+      label: User DN
+      help: Base DN for user search.
+    user_attr:
+      label: User Attribute
+      help: Attribute on user entry matching the username passed during authentication.
+    user_filter:
+      label: User Filter
+      help: Go template used to filter users based on LDAP attributes.
+    group_dn:
+      label: Group DN
+      help: LDAP search base to use for group membership search.
+    group_attr:
+      label: Group Attribute
+      help: LDAP attribute to follow to enumerate user group membership. Default is “cn”.
+    group_filter:
+      label: Group Filter
+      help: Template used when constructing the group membership query.
+    enable_groups:
+      label: Enable Groups
+      help: Find an authenticated user's groups during authentication.
+    use_token_groups:
+      label: Use Token Groups
+      help: Active Directory only. Uses a user's tokenGroups attribute to find their group memberships.
+    account_attribute_maps:
+      label: Account Attribute Maps
+      help: Attribute maps from custom attributes to the standard fullname and email account attributes. These maps are represented as key=value where the key equals the from_attribute, and the value equals the to_attribute. For example, "preferredName=fullName".
+  section:
+    connection:
+      title: Connection
+      help: This group includes inputs for configuring the LDAP server itself, such as the server name, port, and authentication settings.
+    authenticated-search:
+      title: Authenticated search
+      help: Used when Boundary authenticates to the LDAP server.
+    anonymous-search:
+      title: Anonymous search
+      help: Allows you to bind anonymously to the directory when searching for user entries.
+    user-entries:
+      title: User entries
+      help: Before authenticating an end user, Boundary must first find the end user’s entry in the directory.
+    group-entries:
+      title: Group entries
+      help: After authenticating an end user, we need to find out which groups the user is a member of. The configuration for this can vary depending on your LDAP server and your directory schema.
 group:
   title: Group
   title_plural: Groups
diff --git a/ui/admin/app/components/form/auth-method/index.hbs b/ui/admin/app/components/form/auth-method/index.hbs
index 9d7e8b293..edc84fc09 100644
--- a/ui/admin/app/components/form/auth-method/index.hbs
+++ b/ui/admin/app/components/form/auth-method/index.hbs
@@ -12,6 +12,6 @@
     cancel=@cancel
     removeItemByIndex=@removeItemByIndex
     addStringItem=@addStringItem
-    addAccountClaimMapItem=@addAccountClaimMapItem
+    addAccountMapItem=@addAccountMapItem
   }}
 {{/if}}
\ No newline at end of file
diff --git a/ui/admin/app/components/form/auth-method/ldap/index.hbs b/ui/admin/app/components/form/auth-method/ldap/index.hbs
new file mode 100644
index 000000000..7516ed675
--- /dev/null
+++ b/ui/admin/app/components/form/auth-method/ldap/index.hbs
@@ -0,0 +1,662 @@
+{{!
+  Copyright (c) HashiCorp, Inc.
+  SPDX-License-Identifier: MPL-2.0
+}}
+
+<Rose::Form
+  @edit={{@edit}}
+  @onSubmit={{@submit}}
+  @cancel={{@cancel}}
+  @disabled={{@model.isSaving}}
+  @showEditToggle={{if @model.isNew false true}}
+  as |form|
+>
+
+  <Hds::Form::TextInput::Field
+    @type='text'
+    @value={{@model.type}}
+    name='type'
+    disabled={{true}}
+    as |F|
+  >
+    <F.Label>{{t 'form.type.label'}}</F.Label>
+  </Hds::Form::TextInput::Field>
+
+  <Hds::Form::TextInput::Field
+    @isOptional={{true}}
+    @value={{@model.name}}
+    @isInvalid={{@model.errors.name}}
+    @type='text'
+    name='name'
+    disabled={{form.disabled}}
+    {{on 'input' (set-from-event @model 'name')}}
+    as |F|
+  >
+    <F.Label>{{t 'form.name.label'}}</F.Label>
+    <F.HelperText>{{t 'form.name.help'}}</F.HelperText>
+    {{#if @model.errors.name}}
+      <F.Error as |E|>
+        {{#each @model.errors.name as |error|}}
+          <E.Message>{{error.message}}</E.Message>
+        {{/each}}
+      </F.Error>
+    {{/if}}
+  </Hds::Form::TextInput::Field>
+
+  <Hds::Form::Textarea::Field
+    @isOptional={{true}}
+    @value={{@model.description}}
+    @isInvalid={{@model.errors.description}}
+    name='description'
+    disabled={{form.disabled}}
+    as |F|
+  >
+    <F.Label>{{t 'form.description.label'}}</F.Label>
+    <F.HelperText>{{t 'form.description.help'}}</F.HelperText>
+    {{#if @model.errors.description}}
+      <F.Error as |E|>
+        {{#each @model.errors.description as |error|}}
+          <E.Message>{{error.message}}</E.Message>
+        {{/each}}
+      </F.Error>
+    {{/if}}
+  </Hds::Form::Textarea::Field>
+
+  <div class='ldap-section'>
+    <p class='hds-typography-display-300 hds-font-weight-bold'>{{t
+        'resources.auth-method.section.connection.title'
+      }}</p>
+    <Hds::Form::HelperText @controlId='helper-text-for-section'>{{t
+        'resources.auth-method.section.connection.help'
+      }}</Hds::Form::HelperText>
+  </div>
+
+  <Hds::Form::TextInput::Field
+    @isRequired={{true}}
+    @value={{this.urlsArrayString}}
+    @isInvalid={{@model.errors.urls}}
+    @type='url'
+    name='urls'
+    disabled={{form.disabled}}
+    {{on 'input' this.setUrls}}
+    as |F|
+  >
+    <F.Label>{{t 'resources.auth-method.form.urls.label'}}</F.Label>
+    <F.HelperText>{{t 'resources.auth-method.form.urls.help'}}</F.HelperText>
+    {{#if @model.errors.urls}}
+      <F.Error as |E|>
+        {{#each @model.errors.urls as |error|}}
+          <E.Message>{{error.message}}</E.Message>
+        {{/each}}
+      </F.Error>
+    {{/if}}
+  </Hds::Form::TextInput::Field>
+
+  <Hds::Form::Fieldset @isOptional={{true}} as |F|>
+    <F.Legend>{{t 'resources.auth-method.form.certificates.label'}}</F.Legend>
+    <F.HelperText>{{t
+        'resources.auth-method.form.certificates.help'
+      }}</F.HelperText>
+    {{#let (unique-id) as |valueHeaderID|}}
+      <F.Control>
+        <Hds::Table class='key-value-list' name='certificates'>
+          <:head as |H|>
+            <H.Tr>
+              <H.Th id={{valueHeaderID}}>{{t 'titles.value'}}</H.Th>
+              <H.Th>{{t 'titles.actions'}}</H.Th>
+            </H.Tr>
+          </:head>
+          <:body as |B|>
+            {{#each @model.certificates as |cert i|}}
+              <B.Tr>
+                <B.Td>
+                  <Hds::Form::Textarea::Field
+                    @value={{cert.value}}
+                    @isOptional={{true}}
+                    disabled={{form.disabled}}
+                    aria-labelledby={{valueHeaderID}}
+                  />
+                </B.Td>
+                <B.Td>
+                  <Hds::Button
+                    @text={{t 'actions.remove'}}
+                    @color='critical'
+                    @icon='trash'
+                    @isIconOnly={{true}}
+                    disabled={{form.disabled}}
+                    {{on 'click' (fn @removeItemByIndex 'certificates' i)}}
+                  />
+                </B.Td>
+              </B.Tr>
+            {{/each}}
+            <B.Tr>
+              <B.Td>
+                <Hds::Form::Textarea::Field
+                  @value={{this.newCertificate}}
+                  @isOptional={{true}}
+                  disabled={{form.disabled}}
+                  aria-labelledby={{valueHeaderID}}
+                />
+              </B.Td>
+              <B.Td>
+                <Hds::Button
+                  @text={{t 'actions.add'}}
+                  @color='secondary'
+                  disabled={{or form.disabled (not this.newCertificate)}}
+                  {{on 'click' this.addCertificate}}
+                />
+              </B.Td>
+            </B.Tr>
+          </:body>
+        </Hds::Table>
+      </F.Control>
+    {{/let}}
+    {{#if @model.errors.certificates}}
+      <F.Error as |E|>
+        {{#each @model.errors.certificates as |error|}}
+          <E.Message>{{error.message}}</E.Message>
+        {{/each}}
+      </F.Error>
+    {{/if}}
+  </Hds::Form::Fieldset>
+
+  {{#if @model.isNew}}
+    <Hds::Form::TextInput::Field
+      @isOptional={{true}}
+      @value={{@model.client_certificate}}
+      @isInvalid={{@model.errors.client_certificate}}
+      @type='password'
+      name='client_certificate'
+      disabled={{form.disabled}}
+      {{on 'input' (set-from-event @model 'client_certificate')}}
+      as |F|
+    >
+      <F.Label>{{t
+          'resources.auth-method.form.client_certificate.label'
+        }}</F.Label>
+      <F.HelperText>{{t
+          'resources.auth-method.form.client_certificate.help'
+        }}</F.HelperText>
+      {{#if @model.errors.client_certificate}}
+        <F.Error as |E|>
+          {{#each @model.errors.client_certificate as |error|}}
+            <E.Message>{{error.message}}</E.Message>
+          {{/each}}
+        </F.Error>
+      {{/if}}
+    </Hds::Form::TextInput::Field>
+
+    <Hds::Form::TextInput::Field
+      @isOptional={{true}}
+      @value={{@model.client_certificate_key}}
+      @isInvalid={{@model.errors.client_certificate_key}}
+      @type='password'
+      name='client_certificate_key'
+      disabled={{form.disabled}}
+      {{on 'input' (set-from-event @model 'client_certificate_key')}}
+      as |F|
+    >
+      <F.Label>{{t
+          'resources.auth-method.form.client_certificate_key.label'
+        }}</F.Label>
+      <F.HelperText>{{t
+          'resources.auth-method.form.client_certificate_key.help'
+        }}</F.HelperText>
+      {{#if @model.errors.client_certificate_key}}
+        <F.Error as |E|>
+          {{#each @model.errors.client_certificate_key as |error|}}
+            <E.Message>{{error.message}}</E.Message>
+          {{/each}}
+        </F.Error>
+      {{/if}}
+    </Hds::Form::TextInput::Field>
+  {{/if}}
+
+  <Hds::Form::Toggle::Field
+    name='start_tls'
+    checked={{@model.start_tls}}
+    disabled={{form.disabled}}
+    {{on 'change' this.toggleField}}
+    as |F|
+  >
+    <F.Label>{{t 'resources.auth-method.form.start_tls.label'}}</F.Label>
+    <F.HelperText>{{t
+        'resources.auth-method.form.start_tls.help'
+      }}</F.HelperText>
+  </Hds::Form::Toggle::Field>
+
+  <Hds::Form::Toggle::Field
+    name='insecure_tls'
+    checked={{@model.insecure_tls}}
+    disabled={{form.disabled}}
+    {{on 'change' this.toggleField}}
+    as |F|
+  >
+    <F.Label>{{t 'resources.auth-method.form.insecure_tls.label'}}</F.Label>
+    <F.HelperText>{{t
+        'resources.auth-method.form.insecure_tls.help'
+      }}</F.HelperText>
+  </Hds::Form::Toggle::Field>
+
+  <div class='ldap-section'>
+    <p class='hds-typography-display-300 hds-font-weight-bold'>{{t
+        'resources.auth-method.section.authenticated-search.title'
+      }}</p>
+    <Hds::Form::HelperText @controlId='helper-text-for-section'>{{t
+        'resources.auth-method.section.authenticated-search.help'
+      }}</Hds::Form::HelperText>
+  </div>
+
+  <Hds::Form::TextInput::Field
+    @isOptional={{true}}
+    @value={{@model.bind_dn}}
+    @isInvalid={{@model.errors.bind_dn}}
+    @type='text'
+    name='bind_dn'
+    disabled={{form.disabled}}
+    {{on 'input' (set-from-event @model 'bind_dn')}}
+    as |F|
+  >
+    <F.Label>{{t 'resources.auth-method.form.bind_dn.label'}}</F.Label>
+    <F.HelperText>{{t 'resources.auth-method.form.bind_dn.help'}}</F.HelperText>
+    {{#if @model.errors.bind_dn}}
+      <F.Error as |E|>
+        {{#each @model.errors.bind_dn as |error|}}
+          <E.Message>{{error.message}}</E.Message>
+        {{/each}}
+      </F.Error>
+    {{/if}}
+  </Hds::Form::TextInput::Field>
+
+  {{#if @model.isNew}}
+    <Hds::Form::TextInput::Field
+      @isOptional={{true}}
+      @value={{@model.bind_password}}
+      @isInvalid={{@model.errors.bind_password}}
+      @type='password'
+      name='bind_password'
+      disabled={{form.disabled}}
+      {{on 'input' (set-from-event @model 'bind_password')}}
+      as |F|
+    >
+      <F.Label>{{t 'resources.auth-method.form.bind_password.label'}}</F.Label>
+      <F.HelperText>{{t
+          'resources.auth-method.form.bind_password.help'
+        }}</F.HelperText>
+      {{#if @model.errors.bind_password}}
+        <F.Error as |E|>
+          {{#each @model.errors.bind_password as |error|}}
+            <E.Message>{{error.message}}</E.Message>
+          {{/each}}
+        </F.Error>
+      {{/if}}
+    </Hds::Form::TextInput::Field>
+  {{/if}}
+
+  <Hds::Form::TextInput::Field
+    @isOptional={{true}}
+    @value={{@model.upn_domain}}
+    @isInvalid={{@model.errors.upn_domain}}
+    @type='text'
+    name='upn_domain'
+    disabled={{form.disabled}}
+    {{on 'input' (set-from-event @model 'upn_domain')}}
+    as |F|
+  >
+    <F.Label>{{t 'resources.auth-method.form.upn_domain.label'}}</F.Label>
+    <F.HelperText>{{t
+        'resources.auth-method.form.upn_domain.help'
+      }}</F.HelperText>
+    {{#if @model.errors.upn_domain}}
+      <F.Error as |E|>
+        {{#each @model.errors.upn_domain as |error|}}
+          <E.Message>{{error.message}}</E.Message>
+        {{/each}}
+      </F.Error>
+    {{/if}}
+  </Hds::Form::TextInput::Field>
+
+  <div class='ldap-section'>
+    <p class='hds-typography-display-300 hds-font-weight-bold'>{{t
+        'resources.auth-method.section.anonymous-search.title'
+      }}</p>
+    <Hds::Form::HelperText @controlId='helper-text-for-section'>{{t
+        'resources.auth-method.section.anonymous-search.help'
+      }}</Hds::Form::HelperText>
+  </div>
+
+  <Hds::Form::Toggle::Field
+    name='discover_dn'
+    checked={{@model.discover_dn}}
+    disabled={{form.disabled}}
+    {{on 'change' this.toggleField}}
+    as |F|
+  >
+    <F.Label>{{t 'resources.auth-method.form.discover_dn.label'}}</F.Label>
+    <F.HelperText>{{t
+        'resources.auth-method.form.discover_dn.help'
+      }}</F.HelperText>
+  </Hds::Form::Toggle::Field>
+
+  <Hds::Form::Toggle::Field
+    name='anon_group_search'
+    checked={{@model.anon_group_search}}
+    disabled={{form.disabled}}
+    {{on 'change' this.toggleField}}
+    as |F|
+  >
+    <F.Label>{{t
+        'resources.auth-method.form.anon_group_search.label'
+      }}</F.Label>
+    <F.HelperText>{{t
+        'resources.auth-method.form.anon_group_search.help'
+      }}</F.HelperText>
+  </Hds::Form::Toggle::Field>
+
+  <div class='ldap-section'>
+    <p class='hds-typography-display-300 hds-font-weight-bold'>{{t
+        'resources.auth-method.section.user-entries.title'
+      }}</p>
+    <Hds::Form::HelperText @controlId='helper-text-for-section'>{{t
+        'resources.auth-method.section.user-entries.help'
+      }}</Hds::Form::HelperText>
+  </div>
+
+  <Hds::Form::TextInput::Field
+    @isOptional={{true}}
+    @value={{@model.user_dn}}
+    @isInvalid={{@model.errors.user_dn}}
+    @type='text'
+    name='user_dn'
+    disabled={{form.disabled}}
+    {{on 'input' (set-from-event @model 'user_dn')}}
+    as |F|
+  >
+    <F.Label>{{t 'resources.auth-method.form.user_dn.label'}}</F.Label>
+    <F.HelperText>{{t 'resources.auth-method.form.user_dn.help'}}</F.HelperText>
+    {{#if @model.errors.user_dn}}
+      <F.Error as |E|>
+        {{#each @model.errors.user_dn as |error|}}
+          <E.Message>{{error.message}}</E.Message>
+        {{/each}}
+      </F.Error>
+    {{/if}}
+  </Hds::Form::TextInput::Field>
+
+  <Hds::Form::TextInput::Field
+    @isOptional={{true}}
+    @value={{@model.user_attr}}
+    @isInvalid={{@model.errors.user_attr}}
+    @type='text'
+    name='user_attr'
+    disabled={{form.disabled}}
+    {{on 'input' (set-from-event @model 'user_attr')}}
+    as |F|
+  >
+    <F.Label>{{t 'resources.auth-method.form.user_attr.label'}}</F.Label>
+    <F.HelperText>{{t
+        'resources.auth-method.form.user_attr.help'
+      }}</F.HelperText>
+    {{#if @model.errors.user_attr}}
+      <F.Error as |E|>
+        {{#each @model.errors.user_attr as |error|}}
+          <E.Message>{{error.message}}</E.Message>
+        {{/each}}
+      </F.Error>
+    {{/if}}
+  </Hds::Form::TextInput::Field>
+
+  <Hds::Form::TextInput::Field
+    @isOptional={{true}}
+    @value={{@model.user_filter}}
+    @isInvalid={{@model.errors.user_filter}}
+    @type='text'
+    name='user_filter'
+    disabled={{form.disabled}}
+    {{on 'input' (set-from-event @model 'user_filter')}}
+    as |F|
+  >
+    <F.Label>{{t 'resources.auth-method.form.user_filter.label'}}</F.Label>
+    <F.HelperText>{{t
+        'resources.auth-method.form.user_filter.help'
+      }}</F.HelperText>
+    {{#if @model.errors.user_filter}}
+      <F.Error as |E|>
+        {{#each @model.errors.user_filter as |error|}}
+          <E.Message>{{error.message}}</E.Message>
+        {{/each}}
+      </F.Error>
+    {{/if}}
+  </Hds::Form::TextInput::Field>
+
+  <Hds::Form::Fieldset @isOptional={{true}} as |F|>
+    <F.Legend>{{t
+        'resources.auth-method.form.account_attribute_maps.label'
+      }}</F.Legend>
+    <F.HelperText>{{t
+        'resources.auth-method.form.account_attribute_maps.help'
+      }}</F.HelperText>
+    {{#let (unique-id) (unique-id) as |fromHeaderID toHeaderID|}}
+      <F.Control>
+        <Hds::Table class='key-value-list' name='account_attribute_maps'>
+          <:head as |H|>
+            <H.Tr>
+              <H.Th id={{fromHeaderID}}>{{t
+                  'resources.auth-method.titles.from-attr'
+                }}</H.Th>
+              <H.Th id={{toHeaderID}}>{{t
+                  'resources.auth-method.titles.to-attr'
+                }}</H.Th>
+              <H.Th>{{t 'titles.actions'}}</H.Th>
+            </H.Tr>
+          </:head>
+          <:body as |B|>
+            {{#each @model.account_attribute_maps as |attrMap i|}}
+              <B.Tr>
+                <B.Td>
+                  <Hds::Form::TextInput::Field
+                    @value={{attrMap.from}}
+                    @type='text'
+                    disabled={{form.disabled}}
+                    aria-labelledby={{fromHeaderID}}
+                    {{on 'input' (set-from-event attrMap 'from')}}
+                  />
+                </B.Td>
+                <B.Td>
+                  <Hds::Form::Select::Field
+                    @value={{attrMap.to}}
+                    @width='100%'
+                    disabled={{form.disabled}}
+                    aria-labelledby={{toHeaderID}}
+                    {{on 'change' (set-from-event attrMap 'to')}}
+                    as |F|
+                  >
+                    <F.Options>
+                      {{#each this.toAttributes as |toAttrOption|}}
+                        <option
+                          value={{toAttrOption}}
+                          selected={{eq toAttrOption attrMap.to}}
+                        >{{toAttrOption}}</option>
+                      {{/each}}
+                    </F.Options>
+                  </Hds::Form::Select::Field>
+                </B.Td>
+                <B.Td>
+                  <Hds::Button
+                    @text={{t 'actions.remove'}}
+                    @color='critical'
+                    @icon='trash'
+                    @isIconOnly={{true}}
+                    disabled={{form.disabled}}
+                    {{on
+                      'click'
+                      (fn @removeItemByIndex 'account_attribute_maps' i)
+                    }}
+                  />
+                </B.Td>
+              </B.Tr>
+            {{/each}}
+            <B.Tr>
+              <B.Td>
+                <Hds::Form::TextInput::Field
+                  @value={{this.newFromAttribute}}
+                  @type='text'
+                  @isOptional={{true}}
+                  disabled={{form.disabled}}
+                  aria-labelledby={{fromHeaderID}}
+                  {{on 'input' (set-from-event this 'newFromAttribute')}}
+                />
+              </B.Td>
+              <B.Td>
+                <Hds::Form::Select::Field
+                  @value={{this.newToAttribute}}
+                  @width='100%'
+                  disabled={{form.disabled}}
+                  aria-labelledby={{toHeaderID}}
+                  {{on 'change' (set-from-event this 'newToAttribute')}}
+                  as |F|
+                >
+                  <F.Options>
+                    {{#each this.toAttributes as |toAttrOption|}}
+                      <option
+                        value={{toAttrOption}}
+                        selected={{eq toAttrOption this.newToAttribute}}
+                      >{{toAttrOption}}</option>
+                    {{/each}}
+                  </F.Options>
+                </Hds::Form::Select::Field>
+              </B.Td>
+              <B.Td>
+                <Hds::Button
+                  @text={{t 'actions.add'}}
+                  @color='secondary'
+                  disabled={{or form.disabled (not this.newFromAttribute)}}
+                  {{on 'click' this.addAttributeMap}}
+                />
+              </B.Td>
+            </B.Tr>
+          </:body>
+        </Hds::Table>
+      </F.Control>
+    {{/let}}
+    {{#if @model.errors.account_attribute_maps}}
+      <F.Error as |E|>
+        {{#each @model.errors.account_attribute_maps as |error|}}
+          <E.Message>{{error.message}}</E.Message>
+        {{/each}}
+      </F.Error>
+    {{/if}}
+  </Hds::Form::Fieldset>
+
+  <div class='ldap-section'>
+    <p class='hds-typography-display-300 hds-font-weight-bold'>{{t
+        'resources.auth-method.section.group-entries.title'
+      }}</p>
+    <Hds::Form::HelperText @controlId='helper-text-for-section'>{{t
+        'resources.auth-method.section.group-entries.help'
+      }}</Hds::Form::HelperText>
+  </div>
+
+  <Hds::Form::TextInput::Field
+    @isOptional={{true}}
+    @value={{@model.group_dn}}
+    @isInvalid={{@model.errors.group_dn}}
+    @type='text'
+    name='group_dn'
+    disabled={{form.disabled}}
+    {{on 'input' (set-from-event @model 'group_dn')}}
+    as |F|
+  >
+    <F.Label>{{t 'resources.auth-method.form.group_dn.label'}}</F.Label>
+    <F.HelperText>{{t
+        'resources.auth-method.form.group_dn.help'
+      }}</F.HelperText>
+    {{#if @model.errors.group_dn}}
+      <F.Error as |E|>
+        {{#each @model.errors.group_dn as |error|}}
+          <E.Message>{{error.message}}</E.Message>
+        {{/each}}
+      </F.Error>
+    {{/if}}
+  </Hds::Form::TextInput::Field>
+
+  <Hds::Form::TextInput::Field
+    @isOptional={{true}}
+    @value={{@model.group_attr}}
+    @isInvalid={{@model.errors.group_attr}}
+    @type='text'
+    name='group_attr'
+    disabled={{form.disabled}}
+    {{on 'input' (set-from-event @model 'group_attr')}}
+    as |F|
+  >
+    <F.Label>{{t 'resources.auth-method.form.group_attr.label'}}</F.Label>
+    <F.HelperText>{{t
+        'resources.auth-method.form.group_attr.help'
+      }}</F.HelperText>
+    {{#if @model.errors.group_attr}}
+      <F.Error as |E|>
+        {{#each @model.errors.group_attr as |error|}}
+          <E.Message>{{error.message}}</E.Message>
+        {{/each}}
+      </F.Error>
+    {{/if}}
+  </Hds::Form::TextInput::Field>
+
+  <Hds::Form::TextInput::Field
+    @isOptional={{true}}
+    @value={{@model.group_filter}}
+    @isInvalid={{@model.errors.group_filter}}
+    @type='text'
+    name='group_filter'
+    disabled={{form.disabled}}
+    {{on 'input' (set-from-event @model 'group_filter')}}
+    as |F|
+  >
+    <F.Label>{{t 'resources.auth-method.form.group_filter.label'}}</F.Label>
+    <F.HelperText>{{t
+        'resources.auth-method.form.group_filter.help'
+      }}</F.HelperText>
+    {{#if @model.errors.group_filter}}
+      <F.Error as |E|>
+        {{#each @model.errors.group_filter as |error|}}
+          <E.Message>{{error.message}}</E.Message>
+        {{/each}}
+      </F.Error>
+    {{/if}}
+  </Hds::Form::TextInput::Field>
+
+  <Hds::Form::Toggle::Field
+    name='enable_groups'
+    checked={{@model.enable_groups}}
+    disabled={{form.disabled}}
+    {{on 'change' this.toggleField}}
+    as |F|
+  >
+    <F.Label>{{t 'resources.auth-method.form.enable_groups.label'}}</F.Label>
+    <F.HelperText>{{t
+        'resources.auth-method.form.enable_groups.help'
+      }}</F.HelperText>
+  </Hds::Form::Toggle::Field>
+
+  <Hds::Form::Toggle::Field
+    name='use_token_groups'
+    checked={{@model.use_token_groups}}
+    disabled={{form.disabled}}
+    {{on 'change' this.toggleField}}
+    as |F|
+  >
+    <F.Label>{{t 'resources.auth-method.form.use_token_groups.label'}}</F.Label>
+    <F.HelperText>{{t
+        'resources.auth-method.form.use_token_groups.help'
+      }}</F.HelperText>
+  </Hds::Form::Toggle::Field>
+
+  {{#if (can 'save model' @model)}}
+    <form.actions
+      @enableEditText={{t 'actions.edit-form'}}
+      @submitText={{t 'actions.save'}}
+      @cancelText={{t 'actions.cancel'}}
+    />
+  {{/if}}
+</Rose::Form>
\ No newline at end of file
diff --git a/ui/admin/app/components/form/auth-method/ldap/index.js b/ui/admin/app/components/form/auth-method/ldap/index.js
new file mode 100644
index 000000000..26644cc2d
--- /dev/null
+++ b/ui/admin/app/components/form/auth-method/ldap/index.js
@@ -0,0 +1,81 @@
+import Component from '@glimmer/component';
+import { action } from '@ember/object';
+import { tracked } from '@glimmer/tracking';
+import { options } from 'api/models/auth-method';
+
+export default class FormAuthMethodLdapComponent extends Component {
+  // =attributes
+  /**
+   * @type {object}
+   */
+  toAttributes = options.ldap.account_attribute_maps.to;
+
+  /**
+   * @type {string}
+   */
+  newToAttribute = options.ldap.account_attribute_maps.to[0];
+
+  /**
+   * @type {string}
+   */
+  @tracked newFromAttribute = '';
+
+  /**
+   * @type {string}
+   */
+  @tracked newCertificate = '';
+
+  /**
+   * @type {string}
+   */
+  @tracked urlsArrayString = this.parseUrlsArray();
+
+  //actions
+
+  /**
+   * @param {object} event
+   */
+  @action
+  toggleField(event) {
+    const { name: field } = event.target;
+    this.args.model[field] = !this.args.model[field];
+  }
+
+  @action
+  addCertificate() {
+    if (this.newCertificate) {
+      this.args.addStringItem('certificates', this.newCertificate);
+    }
+    this.newCertificate = '';
+  }
+
+  @action
+  addAttributeMap() {
+    if (this.newFromAttribute) {
+      this.args.addAccountMapItem(
+        'account_attribute_maps',
+        this.newFromAttribute,
+        this.newToAttribute
+      );
+    }
+    this.newFromAttribute = '';
+  }
+
+  /**
+   * @param {object} event
+   */
+  @action
+  setUrls(event) {
+    const { value } = event.target;
+    this.urlsArrayString = value;
+    const array = value.split(',').map((item) => ({ value: item }));
+    this.args.model.set('urls', array);
+  }
+
+  /**
+   * @returns {string}
+   */
+  parseUrlsArray() {
+    return (this.args.model.urls || []).map((item) => item.value).toString();
+  }
+}
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 b4ce7cdee..75c35a11a 100644
--- a/ui/admin/app/components/form/auth-method/oidc/index.hbs
+++ b/ui/admin/app/components/form/auth-method/oidc/index.hbs
@@ -11,11 +11,6 @@
   @showEditToggle={{if @model.isNew false true}}
   as |form|
 >
-  <form.actions
-    @enableEditText={{t 'actions.edit-form'}}
-    @submitText={{t 'actions.save'}}
-    @cancelText={{t 'actions.cancel'}}
-  />
 
   <form.input
     @value={{@model.type}}
@@ -547,7 +542,12 @@
                 }}
                 {{on
                   'click'
-                  (fn @addAccountClaimMapItem this.newFromClaim this.newToClaim)
+                  (fn
+                    @addAccountMapItem
+                    'account_claim_maps'
+                    this.newFromClaim
+                    this.newToClaim
+                  )
                 }}
               >
                 {{t 'actions.add'}}
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods.js b/ui/admin/app/routes/scopes/scope/auth-methods.js
index b5522e3db..17a22e2e8 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods.js
@@ -191,16 +191,17 @@ export default class ScopesScopeAuthMethodsRoute extends Route {
   }
 
   /**
-   * Adds an account claim map fragment to the passed OIDC `authMethod`.
+   * Adds an account map fragment to the passed `authMethod`.
    * @param {AuthMethodModel} authMethod
+   * @param {string} field
    * @param {string} from
    * @param {string} to
    */
   @action
-  async addAccountClaimMapItem(authMethod, from, to) {
-    const existingArray = authMethod.account_claim_maps ?? [];
+  async addAccountMapItem(authMethod, field, from, to) {
+    const existingArray = authMethod[field] ?? [];
     const array = [...existingArray, { from, to }];
-    authMethod.set('account_claim_maps', array);
+    authMethod.set(field, array);
   }
 
   /**
diff --git a/ui/admin/app/styles/app.scss b/ui/admin/app/styles/app.scss
index 58700d1c9..43b62bdc1 100644
--- a/ui/admin/app/styles/app.scss
+++ b/ui/admin/app/styles/app.scss
@@ -976,3 +976,13 @@
     }
   }
 }
+
+// ldap form sections
+.ldap-section {
+  margin-top: 4rem;
+
+  .hds-form-helper-text {
+    margin-top: 0.5rem;
+    margin-bottom: 1.5rem;
+  }
+}
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 4e0ee1e05..9a27415c1 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
@@ -29,7 +29,7 @@
       @cancel={{route-action 'cancel' @model}}
       @removeItemByIndex={{route-action 'removeItemByIndex' @model}}
       @addStringItem={{route-action 'addStringItem' @model}}
-      @addAccountClaimMapItem={{route-action 'addAccountClaimMapItem' @model}}
+      @addAccountMapItem={{route-action 'addAccountMapItem' @model}}
     />
   </page.body>
 
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/new.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/new.hbs
index 81ba9dd6c..efb859739 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/new.hbs
@@ -25,7 +25,7 @@
       @cancel={{route-action 'cancel' @model}}
       @removeItemByIndex={{route-action 'removeItemByIndex' @model}}
       @addStringItem={{route-action 'addStringItem' @model}}
-      @addAccountClaimMapItem={{route-action 'addAccountClaimMapItem' @model}}
+      @addAccountMapItem={{route-action 'addAccountMapItem' @model}}
     />
   </page.body>
 </Rose::Layout::Page>
\ No newline at end of file