diff --git a/ui/core/app/router.js b/ui/core/app/router.js
index 289f04d6f..c702702cb 100644
--- a/ui/core/app/router.js
+++ b/ui/core/app/router.js
@@ -75,14 +75,14 @@ Router.map(function () {
         this.route('auth-method', { path: ':auth_method_id' }, function() {
           this.route('accounts', function() {
             this.route('account', { path: ':account_id' }, function() {
-              this.route('settings');
+              this.route('set-password');
             });
             this.route('new');
           });
         });
         this.route('new');
       });
-      
+
     });
   });
 });
diff --git a/ui/core/app/routes/scopes/scope/auth-methods/auth-method/accounts/account/settings.js b/ui/core/app/routes/scopes/scope/auth-methods/auth-method/accounts/account/set-password.js
similarity index 70%
rename from ui/core/app/routes/scopes/scope/auth-methods/auth-method/accounts/account/settings.js
rename to ui/core/app/routes/scopes/scope/auth-methods/auth-method/accounts/account/set-password.js
index 1728382b6..51ee23e65 100644
--- a/ui/core/app/routes/scopes/scope/auth-methods/auth-method/accounts/account/settings.js
+++ b/ui/core/app/routes/scopes/scope/auth-methods/auth-method/accounts/account/set-password.js
@@ -9,6 +9,20 @@ export default class ScopesScopeAuthMethodsAuthMethodAccountsAccountSettingsRout
   @service intl;
   @service notify;
 
+  // =methods
+
+  /**
+   * Renders the route-set specific page sections
+   * @override
+   */
+  renderTemplate() {
+    super.renderTemplate(...arguments);
+    this.render('scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header', {
+      into: 'scopes/scope/auth-methods/auth-method',
+      outlet: 'header'
+    });
+  }
+
   // =actions
 
   /**
@@ -20,7 +34,7 @@ export default class ScopesScopeAuthMethodsAuthMethodAccountsAccountSettingsRout
   async setPassword(account) {
     try {
       await account.setPassword();
-      await this.replaceWith('scopes.scope.auth-methods.auth-method.accounts.account.settings');
+      await this.replaceWith('scopes.scope.auth-methods.auth-method.accounts.account.set-password');
       this.notify.success(
         this.intl.t('notify.save-success')
       );
@@ -35,6 +49,6 @@ export default class ScopesScopeAuthMethodsAuthMethodAccountsAccountSettingsRout
    */
   @action
   cancel() {
-    this.replaceWith('scopes.scope.auth-methods.auth-method.accounts.account.settings');
+    this.replaceWith('scopes.scope.auth-methods.auth-method.accounts.account.set-password');
   }
 }
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs
index b2abc5389..8eab49f00 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs
@@ -1,6 +1 @@
 <h2>{{t "resources.auth-method"}}</h2>
-{{!--
-<Rose::Badge>
-  {{t (concat 'auth.method-types.' @model.type)}}
-</Rose::Badge>
---}}
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs
index 13c6af9c3..6d2a01ffa 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs
@@ -1,4 +1 @@
 <h2>{{t "resources.account"}}</h2>
-<Rose::Badge>
-  {{t (concat 'account.types.' @model.type)}}
-</Rose::Badge>
\ No newline at end of file
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-navigation.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-navigation.hbs
index a7b550c26..5894be22e 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-navigation.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-navigation.hbs
@@ -2,7 +2,7 @@
   <nav.link @route='scopes.scope.auth-methods.auth-method.accounts.account.index'>
     {{t 'titles.details'}}
   </nav.link>
-  <nav.link @route='scopes.scope.auth-methods.auth-method.accounts.account.settings'>
-    {{t 'titles.settings'}}
+  <nav.link @route='scopes.scope.auth-methods.auth-method.accounts.account.set-password'>
+    {{t 'actions.set-password'}}
   </nav.link>
 </Rose::Nav::Tabs>
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/settings.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password.hbs
similarity index 73%
rename from ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/settings.hbs
rename to ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password.hbs
index c26483e46..eba48df37 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/settings.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password.hbs
@@ -1,5 +1,3 @@
-<p>{{t 'descriptions.account-settings-overview'}}</p>
-
 <Form::Account::Password::SetPassword
   @model={{@model}}
   @submit={{route-action "setPassword" @model}}
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header.hbs
new file mode 100644
index 000000000..52910a95a
--- /dev/null
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header.hbs
@@ -0,0 +1,2 @@
+<h2>{{t "resources.account"}}</h2>
+<p>{{t 'descriptions.account-set-password-overview'}}</p>
diff --git a/ui/core/tests/unit/routes/scopes/scope/auth-methods/auth-method/accounts/account/settings-test.js b/ui/core/tests/unit/routes/scopes/scope/auth-methods/auth-method/accounts/account/set-password-test.js
similarity index 75%
rename from ui/core/tests/unit/routes/scopes/scope/auth-methods/auth-method/accounts/account/settings-test.js
rename to ui/core/tests/unit/routes/scopes/scope/auth-methods/auth-method/accounts/account/set-password-test.js
index ec14be2fc..a07676231 100644
--- a/ui/core/tests/unit/routes/scopes/scope/auth-methods/auth-method/accounts/account/settings-test.js
+++ b/ui/core/tests/unit/routes/scopes/scope/auth-methods/auth-method/accounts/account/set-password-test.js
@@ -1,11 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('Unit | Route | scopes/scope/auth-methods/auth-method/accounts/account/settings', function(hooks) {
+module('Unit | Route | scopes/scope/auth-methods/auth-method/accounts/account/set-password', function(hooks) {
   setupTest(hooks);
 
   test('it exists', function(assert) {
-    let route = this.owner.lookup('route:scopes/scope/auth-methods/auth-method/accounts/account/settings');
+    let route = this.owner.lookup('route:scopes/scope/auth-methods/auth-method/accounts/account/set-password');
     assert.ok(route);
   });
 });
diff --git a/ui/core/translations/en-us.yaml b/ui/core/translations/en-us.yaml
index d7e9a610b..3b375d769 100644
--- a/ui/core/translations/en-us.yaml
+++ b/ui/core/translations/en-us.yaml
@@ -29,6 +29,7 @@ actions:
   add-members: Add Members
   add-hosts: Add Hosts
   add-account: Create Account
+  set-password: Set Password
 auth:
   titles:
     no-scopes: No Scopes Available
@@ -132,7 +133,7 @@ descriptions:
   no-principals-available: Principals are not available for assignment.
   group-members-welcome: Users belonging to this group appear here.
   no-available-users: No users are available to add to this group.
-  account-settings-overview: Set the password for current account.
+  account-set-password-overview: Set the password for current account.
   accounts-welcome: No accounts are available in this auth method.
 states:
   info: Info