diff --git a/ui/core/app/components/form/account/password/index.hbs b/ui/core/app/components/form/account/password/index.hbs
index a608fb281..e2890657e 100644
--- a/ui/core/app/components/form/account/password/index.hbs
+++ b/ui/core/app/components/form/account/password/index.hbs
@@ -54,13 +54,13 @@
     @type="text"
     @value={{@model.attributes.login_name}}
     @label={{t "form.login_name.label"}}
-    @error={{@model.errors.name}}
+    @error={{@model.errors.login_name}}
     @helperText={{t "form.login_name.help"}}
     readonly={{false}}
   as |field|>
-    {{#if @model.errors.name}}
+    {{#if @model.errors.login_name}}
       <field.errors as |errors|>
-        {{#each @model.errors.name as |error|}}
+        {{#each @model.errors.login_name as |error|}}
           <errors.message>{{error.message}}</errors.message>
         {{/each}}
       </field.errors>
@@ -73,14 +73,14 @@
       @type="password"
       @value={{this.password}}
       @label={{t "form.password.label"}}
-      @error={{@model.errors.name}}
-      @helperText={{t "form.login_name.password.help"}}
+      @error={{@model.errors.password}}
+      @helperText={{t "form.password.help"}}
       readonly={{false}}
       autocomplete="new-password"
     as |field|>
-      {{#if @model.errors.name}}
+      {{#if @model.errors.password}}
         <field.errors as |errors|>
-          {{#each @model.errors.name as |error|}}
+          {{#each @model.errors.password as |error|}}
             <errors.message>{{error.message}}</errors.message>
           {{/each}}
         </field.errors>
diff --git a/ui/core/app/components/form/account/password/set-password/index.hbs b/ui/core/app/components/form/account/password/set-password/index.hbs
index 5103b7ed9..0a316121e 100644
--- a/ui/core/app/components/form/account/password/set-password/index.hbs
+++ b/ui/core/app/components/form/account/password/set-password/index.hbs
@@ -11,14 +11,14 @@
     @type="password"
     @value={{this.password}}
     @label={{t "form.password.label"}}
-    @error={{@model.errors.name}}
-    @helperText={{t "form.login_name.set_password.help"}}
+    @error={{@model.errors.password}}
+    @helperText={{t "form.set_password.help"}}
     readonly={{false}}
     autocomplete="new-password"
   as |field|>
-    {{#if @model.errors.name}}
+    {{#if @model.errors.password}}
       <field.errors as |errors|>
-        {{#each @model.errors.name as |error|}}
+        {{#each @model.errors.password as |error|}}
           <errors.message>{{error.message}}</errors.message>
         {{/each}}
       </field.errors>
diff --git a/ui/core/translations/form/en-us.yaml b/ui/core/translations/form/en-us.yaml
index ffba8f6c8..205b7d987 100644
--- a/ui/core/translations/form/en-us.yaml
+++ b/ui/core/translations/form/en-us.yaml
@@ -12,12 +12,11 @@ type:
 login_name:
   label: Username
   help: The username for the account
-  password:
-    help: The password for the account
-  set_password:
-    help: Create a new password for the account
+set_password:
+  help: Create a new password for the account
 password:
   label: Password
+  help: The password for the account
 grant:
   label: Grant
   help: A permissions grant string for a role