diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index 289959e6c..ac4dbc6a6 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -390,8 +390,6 @@ credential:
     username_password: Username & Password
   help:
     username_password: This host requires a username and password to connect.
-    username: The username to use when signing in with this credential store.
-    password: The password to use when signing in with this credential store.
 scope:
   title: Scope
   title_plural: Scopes
diff --git a/ui/admin/app/components/form/credential/index.hbs b/ui/admin/app/components/form/credential/index.hbs
index 3f6f07d51..6600f7ac2 100644
--- a/ui/admin/app/components/form/credential/index.hbs
+++ b/ui/admin/app/components/form/credential/index.hbs
@@ -71,7 +71,6 @@
     @value={{@model.username}}
     @label={{t 'form.username.label'}}
     @error={{@model.errors.username}}
-    @helperText={{t 'resources.credential.help.username'}}
     disabled={{@model.isSaving}}
     readonly={{false}}
     as |field|
@@ -84,36 +83,14 @@
       </field.errors>
     {{/if}}
   </form.input>
-  {{#if @model.isNew}}
-    <form.input
-      @name='password'
-      @type='password'
-      @value={{@model.password}}
-      @label={{t 'form.password.label'}}
-      @error={{@model.errors.password}}
-      @helperText={{t 'resources.credential.help.password'}}
-      disabled={{@model.isSaving}}
-      readonly={{false}}
-      as |field|
-    >
-      {{#if @model.errors.password}}
-        <field.errors as |errors|>
-          {{#each @model.errors.password as |error|}}
-            <errors.message>{{error.message}}</errors.message>
-          {{/each}}
-        </field.errors>
-      {{/if}}
-    </form.input>
-  {{/if}}
 
-  {{#if form.isEditable}}
+  {{#if (or @model.isNew form.isEditable)}}
     <form.input
       @name='password'
       @type='password'
       @value={{@model.password}}
       @label={{t 'form.password.label'}}
       @error={{@model.errors.password}}
-      @helperText={{t 'resources.credential.help.password'}}
       disabled={{@model.isSaving}}
       readonly={{false}}
       as |field|