diff --git a/addons/api/mirage/generated/factories/auth-method.js b/addons/api/mirage/generated/factories/auth-method.js
index 67bfb4196..72d7b758a 100644
--- a/addons/api/mirage/generated/factories/auth-method.js
+++ b/addons/api/mirage/generated/factories/auth-method.js
@@ -50,10 +50,10 @@ export default Factory.extend({
           urls: [`ldap://${faker.internet.domainName()}`],
           certificates: [faker.random.alphaNumeric(50)],
           client_certificate: faker.random.alphaNumeric(50),
-          certificate_key: `---Begin Certificate --- ${faker.random.alphaNumeric(
+          client_certificate_key: `---Begin Certificate --- ${faker.random.alphaNumeric(
             170
           )} ---End Certificate ---`,
-          certificate_key_hmac: faker.random.alphaNumeric(50),
+          client_certificate_key_hmac: faker.random.alphaNumeric(50),
           enable_groups: true,
           start_tls: false,
           insecure_tls: false,
diff --git a/ui/admin/app/components/form/auth-method/ldap/index.hbs b/ui/admin/app/components/form/auth-method/ldap/index.hbs
index ca40e6a7f..b768bf466 100644
--- a/ui/admin/app/components/form/auth-method/ldap/index.hbs
+++ b/ui/admin/app/components/form/auth-method/ldap/index.hbs
@@ -160,30 +160,32 @@
     {{/if}}
   </Hds::Form::Fieldset>
 
-  <Hds::Form::Textarea::Field
-    @isOptional={{true}}
-    @value={{@model.client_certificate}}
-    @isInvalid={{@model.errors.client_certificate}}
-    name='client_certificate'
-    disabled={{form.disabled}}
-    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::Textarea::Field>
-
   {{#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}}
@@ -194,12 +196,12 @@
       {{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>
+      <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|}}
@@ -278,9 +280,9 @@
       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>
+      <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|}}