diff --git a/ui/core/app/routes/scopes/scope/auth-methods/auth-method.js b/ui/core/app/routes/scopes/scope/auth-methods/auth-method.js
index a0d7dca9d..3c608f660 100644
--- a/ui/core/app/routes/scopes/scope/auth-methods/auth-method.js
+++ b/ui/core/app/routes/scopes/scope/auth-methods/auth-method.js
@@ -4,7 +4,7 @@ export default class ScopesScopeAuthMethodsAuthMethodRoute extends Route {
   // =methods
 
   /**
-   * Load a single auth-method in current scope.
+   * Load an auth method by ID.
    * @param {object} params
    * @param {string} params.auth_method_id
    * @return {authMethodModel}
diff --git a/ui/core/app/routes/scopes/scope/auth-methods/auth-method/accounts.js b/ui/core/app/routes/scopes/scope/auth-methods/auth-method/accounts.js
index 54ac54e9f..7bd909128 100644
--- a/ui/core/app/routes/scopes/scope/auth-methods/auth-method/accounts.js
+++ b/ui/core/app/routes/scopes/scope/auth-methods/auth-method/accounts.js
@@ -12,15 +12,17 @@ export default class ScopesScopeAuthMethodsAuthMethodAccountsRoute extends Route
   // =methods
 
   /**
-   * Returns accounts in current auth method.
+   * Returns accounts for the current auth method.
    * @return {Promise{[AccountModel]}}
    */
   model() {
-    const { id: auth_method_id } = this.modelFor('scopes.scope.auth-methods.auth-method');
+    const { id: auth_method_id } =
+      this.modelFor('scopes.scope.auth-methods.auth-method');
     return this.store.query('account', { auth_method_id });
   }
 
   // =actions
+
   /**
    * Rollback changes on an account.
    * @param {AccountModel} account
@@ -38,11 +40,11 @@ export default class ScopesScopeAuthMethodsAuthMethodAccountsRoute extends Route
   async save(account) {
     try {
       await account.save();
-      this.refresh();
+      await this.refresh();
+      await this.transitionTo('scopes.scope.auth-methods.auth-method.accounts.account', account);
       this.notify.success(
         this.intl.t('notify.save-success')
       );
-      this.transitionTo('scopes.scope.auth-methods.auth-method.accounts.account', account);
     } catch (error) {
       // TODO: replace with translated strings
       this.notify.error(error.message, { closeAfter: null });
diff --git a/ui/core/app/routes/scopes/scope/auth-methods/auth-method/accounts/account.js b/ui/core/app/routes/scopes/scope/auth-methods/auth-method/accounts/account.js
index 9b848945a..4b290a2c3 100644
--- a/ui/core/app/routes/scopes/scope/auth-methods/auth-method/accounts/account.js
+++ b/ui/core/app/routes/scopes/scope/auth-methods/auth-method/accounts/account.js
@@ -5,7 +5,7 @@ export default class ScopesScopeAuthMethodsAuthMethodAccountsAccountRoute extend
   // =methods
 
   /**
-   * Load an account in current scope.
+   * Load an account by ID.
    * @param {object} params
    * @param {string} params.account_id
    * @return {AccountModel}
@@ -27,7 +27,6 @@ export default class ScopesScopeAuthMethodsAuthMethodAccountsAccountRoute extend
     });
 
     this.render('-empty', {
-    // this.render('scopes/scope/auth-methods/auth-method/accounts/account/-actions', {
       into: 'scopes/scope/auth-methods/auth-method',
       outlet: 'actions'
     });
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs
index 6b68c78f7..8586ac7c0 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs
@@ -30,9 +30,9 @@
 {{else}}
 
   <Rose::Layout::Centered>
-    <Rose::Message @title={{t "titles.auth-method-accounts-welcome"}} as |message|>
+    <Rose::Message @title={{t "titles.accounts-welcome"}} as |message|>
       <message.description>
-        {{t "descriptions.auth-method-accounts-welcome"}}
+        {{t "descriptions.accounts-welcome"}}
       </message.description>
     </Rose::Message>
   </Rose::Layout::Centered>
diff --git a/ui/core/translations/en-us.yaml b/ui/core/translations/en-us.yaml
index 3e972fc9e..bc7e08dc6 100644
--- a/ui/core/translations/en-us.yaml
+++ b/ui/core/translations/en-us.yaml
@@ -109,7 +109,7 @@ titles:
   no-available-users: No Users Available
   accounts: Accounts
   account: Account
-  auth-method-accounts-welcome: Welcome to Accounts
+  accounts-welcome: Welcome to Accounts
 descriptions:
   host-catalogs: Overview of collections of hosts and host sets.
   empty-set: There are no items to display yet.  You may be able to add items or try back later.
@@ -130,7 +130,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.
-  auth-method-accounts-welcome: No accounts are available in this auth method.
+  accounts-welcome: No accounts are available in this auth method.
 states:
   info: Info
   success: Success