diff --git a/addons/api/addon/models/group.js b/addons/api/addon/models/group.js
index 4b6535065..59a87a180 100644
--- a/addons/api/addon/models/group.js
+++ b/addons/api/addon/models/group.js
@@ -46,8 +46,6 @@ export default class GroupModel extends GeneratedGroupModel {
       memberIDs,
     };
     // There is no "deep merge" in ES.
-    // All of this nonsense is here to ensure we get
-    // a decent merge of `adapterOptions`.
     return this.save({
       ...options,
       adapterOptions: {
@@ -71,8 +69,6 @@ export default class GroupModel extends GeneratedGroupModel {
       memberIDs,
     };
     // There is no "deep merge" in ES.
-    // All of this nonsense is here to ensure we get
-    // a decent merge of `adapterOptions`.
     return this.save({
       ...options,
       adapterOptions: {
diff --git a/addons/api/addon/models/role.js b/addons/api/addon/models/role.js
index 9e37867ad..adc7778f5 100644
--- a/addons/api/addon/models/role.js
+++ b/addons/api/addon/models/role.js
@@ -53,8 +53,6 @@ export default class RoleModel extends GeneratedRoleModel {
       principalIDs,
     };
     // There is no "deep merge" in ES.
-    // All of this nonsense is here to ensure we get
-    // a decent merge of `adapterOptions`.
     return this.save({
       ...options,
       adapterOptions: {
@@ -78,8 +76,6 @@ export default class RoleModel extends GeneratedRoleModel {
       principalIDs,
     };
     // There is no "deep merge" in ES.
-    // All of this nonsense is here to ensure we get
-    // a decent merge of `adapterOptions`.
     return this.save({
       ...options,
       adapterOptions: {
diff --git a/addons/api/addon/models/target.js b/addons/api/addon/models/target.js
index 086f95f79..c5f80ae4e 100644
--- a/addons/api/addon/models/target.js
+++ b/addons/api/addon/models/target.js
@@ -52,8 +52,6 @@ export default class TargetModel extends GeneratedTargetModel {
       hostSetIDs,
     };
     // There is no "deep merge" in ES.
-    // All of this nonsense is here to ensure we get
-    // a decent merge of `adapterOptions`.
     return this.save({
       ...options,
       adapterOptions: {
@@ -77,8 +75,6 @@ export default class TargetModel extends GeneratedTargetModel {
       hostSetIDs,
     };
     // There is no "deep merge" in ES.
-    // All of this nonsense is here to ensure we get
-    // a decent merge of `adapterOptions`.
     return this.save({
       ...options,
       adapterOptions: {
diff --git a/addons/api/addon/models/user.js b/addons/api/addon/models/user.js
index c2be5cfb0..567ebd81c 100644
--- a/addons/api/addon/models/user.js
+++ b/addons/api/addon/models/user.js
@@ -33,8 +33,6 @@ export default class UserModel extends GeneratedUserModel {
       accountIDs,
     };
     // There is no "deep merge" in ES.
-    // All of this nonsense is here to ensure we get
-    // a decent merge of `adapterOptions`.
     return this.save({
       ...options,
       adapterOptions: {
@@ -58,8 +56,6 @@ export default class UserModel extends GeneratedUserModel {
       accountIDs,
     };
     // There is no "deep merge" in ES.
-    // All of this nonsense is here to ensure we get
-    // a decent merge of `adapterOptions`.
     return this.save({
       ...options,
       adapterOptions: {
diff --git a/ui/core/app/components/form/account/password/change-password/index.hbs b/ui/core/app/components/form/account/password/change-password/index.hbs
index 24548e843..954da26c1 100644
--- a/ui/core/app/components/form/account/password/change-password/index.hbs
+++ b/ui/core/app/components/form/account/password/change-password/index.hbs
@@ -1,6 +1,6 @@
 <Rose::Form
   class="full-width"
-  @onSubmit={{fn this.submit @submit}}
+  @onSubmit={{fn this.submit @submit this.currentPassword this.newPassword}}
   @cancel={{fn this.cancel @cancel}}
   @disabled={{@model.isSaving}}
   @error={{@model.errors.base}}
diff --git a/ui/core/app/components/form/account/password/change-password/index.js b/ui/core/app/components/form/account/password/change-password/index.js
index 0375feaea..e2dcd0bac 100644
--- a/ui/core/app/components/form/account/password/change-password/index.js
+++ b/ui/core/app/components/form/account/password/change-password/index.js
@@ -2,7 +2,7 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { computed } from '@ember/object';
 import { action } from '@ember/object';
-import { next } from '@ember/runloop';
+import { run } from '@ember/runloop';
 
 export default class FormAccountPasswordChangePasswordIndexComponent extends Component {
 
@@ -50,13 +50,13 @@ export default class FormAccountPasswordChangePasswordIndexComponent extends Com
    * Call passed submit function with passwords.
    * Unset passwords before callack.
    * @param {function} fn
+   * @param {string} currentPassword
+   * @param {string} newPassword
    */
   @action
-  submit(fn) {
-    const currentPassword = this.currentPassword;
-    const newPassword = this.newPassword;
-    next(() => this.resetPasswords());
-    fn(currentPassword, newPassword);
+  submit(fn, currentPassword, newPassword) {
+    run(() => this.resetPasswords());
+    run(() => fn(currentPassword, newPassword));
   }
 
   /**
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 b77d6b659..9008a9094 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
@@ -1,5 +1,5 @@
 <Rose::Form
-  @onSubmit={{fn this.submit @submit}}
+  @onSubmit={{fn this.submit @submit this.password}}
   @disabled={{@model.isSaving}}
   @error={{@model.errors.base}}
   as |form|
diff --git a/ui/core/app/components/form/account/password/set-password/index.js b/ui/core/app/components/form/account/password/set-password/index.js
index 2548bca49..62df4d78c 100644
--- a/ui/core/app/components/form/account/password/set-password/index.js
+++ b/ui/core/app/components/form/account/password/set-password/index.js
@@ -2,7 +2,7 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { computed } from '@ember/object';
 import { action } from '@ember/object';
-import { next } from '@ember/runloop';
+import { run } from '@ember/runloop';
 
 export default class FormAccountPasswordSetPasswordIndexComponent extends Component {
   // =properties
@@ -36,11 +36,11 @@ export default class FormAccountPasswordSetPasswordIndexComponent extends Compon
    * Submit with password value when it is allowed.
    * Callback with no arguments otherwise.
    * @param {function} fn
+   * @param {string} password
    */
   @action
-  submit(fn) {
-    const password = this.password;
-    next(() => this.resetPassword());
-    fn(password);
+  submit(fn, password) {
+    run(() => this.resetPassword());
+    run(() => fn(password));
   }
 }
diff --git a/ui/core/app/templates/scopes/scope/auth-methods.hbs b/ui/core/app/templates/scopes/scope/auth-methods.hbs
index c24cd6895..fb4d78b4a 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods.hbs
@@ -1 +1,3 @@
+{{title (t "resources.auth-method.title_plural")}}
+
 {{outlet}}
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account.hbs
index e2147cab0..d66e83390 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account.hbs
@@ -1 +1,3 @@
-{{outlet}}
\ No newline at end of file
+{{title @model.displayName}}
+
+{{outlet}}
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password.hbs
index eba48df37..315877a6f 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password.hbs
@@ -1,3 +1,5 @@
+{{title (t 'actions.set-password')}}
+
 <Form::Account::Password::SetPassword
   @model={{@model}}
   @submit={{route-action "setPassword" @model}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set.hbs
index e2147cab0..d66e83390 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set.hbs
@@ -1 +1,3 @@
-{{outlet}}
\ No newline at end of file
+{{title @model.displayName}}
+
+{{outlet}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host.hbs
index e2147cab0..d66e83390 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host.hbs
@@ -1 +1,3 @@
-{{outlet}}
\ No newline at end of file
+{{title @model.displayName}}
+
+{{outlet}}
diff --git a/ui/core/app/templates/scopes/scope/roles/role/principals/-header.hbs b/ui/core/app/templates/scopes/scope/roles/role/principals/-header.hbs
index 63c44f53c..8854ae095 100644
--- a/ui/core/app/templates/scopes/scope/roles/role/principals/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/role/principals/-header.hbs
@@ -4,9 +4,9 @@
 </h2>
 <p>{{t "resources.role.principal.description"}}</p>
 <Copyable
-  @text={{@model.id}}
+  @text={{@model.role.id}}
   @buttonText={{t "actions.copy-to-clipboard"}}
   @acknowledgeText={{t "states.copied"}}
 >
-  <code>{{@model.id}}</code>
+  <code>{{@model.role.id}}</code>
 </Copyable>