diff --git a/ui/core/app/routes/scopes/scope/auth-methods.js b/ui/core/app/routes/scopes/scope/auth-methods.js
index 149cec2ef..d68b2833b 100644
--- a/ui/core/app/routes/scopes/scope/auth-methods.js
+++ b/ui/core/app/routes/scopes/scope/auth-methods.js
@@ -1,6 +1,7 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
+import loading from 'ember-loading/decorator';
 
 export default class ScopesScopeAuthMethodsRoute extends Route {
   // =services
@@ -44,6 +45,7 @@ export default class ScopesScopeAuthMethodsRoute extends Route {
    * @param {AuthMethodModel} authMethod
    */
   @action
+  @loading
   async save(authMethod) {
     const { isNew } = authMethod;
     try {
@@ -67,6 +69,7 @@ export default class ScopesScopeAuthMethodsRoute extends Route {
    * @param {AuthMethodModel} authMethod
    */
   @action
+  @loading
   async delete(authMethod) {
     try {
       await authMethod.destroyRecord();
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 e2846e829..752e063f0 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
@@ -1,6 +1,7 @@
 import Route from '@ember/routing/route';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
+import loading from 'ember-loading/decorator';
 
 export default class ScopesScopeAuthMethodsAuthMethodAccountsRoute extends Route {
   // =services
@@ -40,6 +41,7 @@ export default class ScopesScopeAuthMethodsAuthMethodAccountsRoute extends Route
    * @param {AccountModel} account
    */
   @action
+  @loading
   async save(account, password) {
     const { isNew } = account;
     const adapterOptions = {};
@@ -67,6 +69,7 @@ export default class ScopesScopeAuthMethodsAuthMethodAccountsRoute extends Route
    * @param {AccountModel} account
    */
   @action
+  @loading
   async delete(account) {
     try {
       await account.destroyRecord();
diff --git a/ui/core/app/routes/scopes/scope/auth-methods/auth-method/accounts/account/set-password.js b/ui/core/app/routes/scopes/scope/auth-methods/auth-method/accounts/account/set-password.js
index f650a1860..03a582d1b 100644
--- a/ui/core/app/routes/scopes/scope/auth-methods/auth-method/accounts/account/set-password.js
+++ b/ui/core/app/routes/scopes/scope/auth-methods/auth-method/accounts/account/set-password.js
@@ -1,6 +1,7 @@
 import Route from '@ember/routing/route';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
+import loading from 'ember-loading/decorator';
 
 export default class ScopesScopeAuthMethodsAuthMethodAccountsAccountSettingsRoute extends Route {
   // =services
@@ -33,6 +34,7 @@ export default class ScopesScopeAuthMethodsAuthMethodAccountsAccountSettingsRout
    * @param {string} password
    */
   @action
+  @loading
   async setPassword(account, password) {
     try {
       await account.setPassword(password);
diff --git a/ui/core/app/routes/scopes/scope/authenticate/method.js b/ui/core/app/routes/scopes/scope/authenticate/method.js
index 7a0ce5580..891fbea04 100644
--- a/ui/core/app/routes/scopes/scope/authenticate/method.js
+++ b/ui/core/app/routes/scopes/scope/authenticate/method.js
@@ -1,6 +1,7 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
+import loading from 'ember-loading/decorator';
 
 export default class ScopesScopeAuthenticateMethodRoute extends Route {
   // =services
@@ -38,6 +39,7 @@ export default class ScopesScopeAuthenticateMethodRoute extends Route {
    * If authentication fails, notifies with an alert.
    */
   @action
+  @loading
   async authenticate(creds) {
     this.resetCredentials();
     const authenticatorName = 'authenticator:password';
diff --git a/ui/core/app/routes/scopes/scope/groups.js b/ui/core/app/routes/scopes/scope/groups.js
index c221b3277..e8e607967 100644
--- a/ui/core/app/routes/scopes/scope/groups.js
+++ b/ui/core/app/routes/scopes/scope/groups.js
@@ -1,6 +1,7 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
+import loading from 'ember-loading/decorator';
 
 export default class ScopesScopeGroupsRoute extends Route {
   // =services
@@ -44,6 +45,7 @@ export default class ScopesScopeGroupsRoute extends Route {
    * @param {GroupModel} group
    */
   @action
+  @loading
   async save(group) {
     const { isNew } = group;
     try {
@@ -64,6 +66,7 @@ export default class ScopesScopeGroupsRoute extends Route {
    * @param {GroupModel} group
    */
   @action
+  @loading
   async delete(group) {
     try {
       await group.destroyRecord();
diff --git a/ui/core/app/routes/scopes/scope/groups/group/add-members.js b/ui/core/app/routes/scopes/scope/groups/group/add-members.js
index 9cb5fc3e1..240e0a442 100644
--- a/ui/core/app/routes/scopes/scope/groups/group/add-members.js
+++ b/ui/core/app/routes/scopes/scope/groups/group/add-members.js
@@ -2,6 +2,7 @@ import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { hash } from 'rsvp';
+import loading from 'ember-loading/decorator';
 
 export default class ScopesScopeGroupsGroupAddMembersRoute extends Route {
   // =services
@@ -63,6 +64,7 @@ export default class ScopesScopeGroupsGroupAddMembersRoute extends Route {
    * @param {[string]} userIDs
    */
   @action
+  @loading
   async addMembers(group, userIDs) {
     try {
       await group.addMembers(userIDs);
diff --git a/ui/core/app/routes/scopes/scope/groups/group/members.js b/ui/core/app/routes/scopes/scope/groups/group/members.js
index f51d8a0b9..8b3c34bc4 100644
--- a/ui/core/app/routes/scopes/scope/groups/group/members.js
+++ b/ui/core/app/routes/scopes/scope/groups/group/members.js
@@ -2,6 +2,7 @@ import Route from '@ember/routing/route';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { hash, all } from 'rsvp';
+import loading from 'ember-loading/decorator';
 
 export default class ScopesScopeGroupsGroupMembersRoute extends Route {
   // =services
@@ -36,6 +37,7 @@ export default class ScopesScopeGroupsGroupMembersRoute extends Route {
    * @param {UserModel} member
    */
   @action
+  @loading
   async removeMember(group, member) {
     try {
       await group.removeMember(member.id);
diff --git a/ui/core/app/routes/scopes/scope/orgs.js b/ui/core/app/routes/scopes/scope/orgs.js
index 30a6c938f..a1e85bb9e 100644
--- a/ui/core/app/routes/scopes/scope/orgs.js
+++ b/ui/core/app/routes/scopes/scope/orgs.js
@@ -1,6 +1,7 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
+import loading from 'ember-loading/decorator';
 
 export default class ScopesScopeOrgsRoute extends Route {
   // =services
@@ -48,6 +49,7 @@ export default class ScopesScopeOrgsRoute extends Route {
    * @param {Event} e
    */
   @action
+  @loading
   async save(org) {
     const { isNew } = org;
     try {
diff --git a/ui/core/app/routes/scopes/scope/projects.js b/ui/core/app/routes/scopes/scope/projects.js
index 0a6895e54..51650f447 100644
--- a/ui/core/app/routes/scopes/scope/projects.js
+++ b/ui/core/app/routes/scopes/scope/projects.js
@@ -1,6 +1,7 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
+import loading from 'ember-loading/decorator';
 
 export default class ScopesScopeProjectsRoute extends Route {
   // =services
@@ -60,6 +61,7 @@ export default class ScopesScopeProjectsRoute extends Route {
    * @param {Event} e
    */
   @action
+  @loading
   async save(project) {
     const { isNew } = project;
     try {
@@ -80,6 +82,7 @@ export default class ScopesScopeProjectsRoute extends Route {
    * @param {ProjectModel} project
    */
   @action
+  @loading
   async delete(project) {
     try {
       await project.destroyRecord();
diff --git a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs.js b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs.js
index 9989ec112..31618cf93 100644
--- a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs.js
+++ b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs.js
@@ -1,6 +1,7 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
+import loading from 'ember-loading/decorator';
 
 export default class ScopesScopeProjectsProjectHostCatalogsRoute extends Route {
   // =services
@@ -38,6 +39,7 @@ export default class ScopesScopeProjectsProjectHostCatalogsRoute extends Route {
    * @param {Event} e
    */
   @action
+  @loading
   async save(hostCatalog) {
     const { isNew } = hostCatalog;
     try {
@@ -61,6 +63,7 @@ export default class ScopesScopeProjectsProjectHostCatalogsRoute extends Route {
    * @param {ProjectModel} project
    */
   @action
+  @loading
   async delete(project) {
     try {
       await project.destroyRecord();
diff --git a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets.js b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets.js
index ddd865912..008429df4 100644
--- a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets.js
+++ b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets.js
@@ -1,6 +1,7 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
+import loading from 'ember-loading/decorator';
 
 export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogHostSetsRoute extends Route {
   // =services
@@ -43,6 +44,7 @@ export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogHostSetsRo
    * @param {Event} e
    */
   @action
+  @loading
   async save(hostSet) {
     try {
       const { isNew } = hostSet;
@@ -66,6 +68,7 @@ export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogHostSetsRo
    * @param {HostSetModel} hostSet
    */
   @action
+  @loading
   async delete(hostSet) {
     try {
       await hostSet.destroyRecord();
diff --git a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/add-hosts.js b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/add-hosts.js
index 33e9af6c2..75fd25649 100644
--- a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/add-hosts.js
+++ b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/add-hosts.js
@@ -2,6 +2,7 @@ import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { hash } from 'rsvp';
+import loading from 'ember-loading/decorator';
 
 export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogHostSetsHostSetAddHostsRoute extends Route {
   // =services
@@ -87,6 +88,7 @@ export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogHostSetsHo
    * @param {HostSetModel} hostSet
    */
   @action
+  @loading
   async addHosts(hostSet, hostIDs) {
     try {
       await hostSet.addHosts(hostIDs);
diff --git a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/hosts.js b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/hosts.js
index 772d07357..e13798b48 100644
--- a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/hosts.js
+++ b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/hosts.js
@@ -2,6 +2,7 @@ import Route from '@ember/routing/route';
 import { hash, all } from 'rsvp';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
+import loading from 'ember-loading/decorator';
 
 export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogHostSetsHostSetHostsRoute extends Route {
   // =services
@@ -35,6 +36,7 @@ export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogHostSetsHo
    * @param {HostModel} host
    */
   @action
+  @loading
   async removeHost(hostSet, host) {
     try {
       const scopeID = this.modelFor('scopes.scope.projects.project').id;
diff --git a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/hosts.js b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/hosts.js
index 1bab7ab3a..b0ce74d38 100644
--- a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/hosts.js
+++ b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/hosts.js
@@ -1,6 +1,7 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
+import loading from 'ember-loading/decorator';
 
 export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogHostsRoute extends Route {
   // =services
@@ -43,6 +44,7 @@ export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogHostsRoute
    * @param {Event} e
    */
   @action
+  @loading
   async save(host) {
     try {
       const { isNew } = host;
@@ -66,6 +68,7 @@ export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogHostsRoute
    * @param {HostModel} host
    */
   @action
+  @loading
   async delete(host) {
     try {
       await host.destroyRecord();
diff --git a/ui/core/app/routes/scopes/scope/projects/project/targets.js b/ui/core/app/routes/scopes/scope/projects/project/targets.js
index d6f1c0a56..501343e8d 100644
--- a/ui/core/app/routes/scopes/scope/projects/project/targets.js
+++ b/ui/core/app/routes/scopes/scope/projects/project/targets.js
@@ -1,6 +1,7 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
+import loading from 'ember-loading/decorator';
 
 export default class ScopesScopeProjectsProjectTargetsRoute extends Route {
   // =services
@@ -38,6 +39,7 @@ export default class ScopesScopeProjectsProjectTargetsRoute extends Route {
    * @param {Event} e
    */
   @action
+  @loading
   async save(target) {
     const { isNew } = target;
     try {
@@ -58,6 +60,7 @@ export default class ScopesScopeProjectsProjectTargetsRoute extends Route {
    * @param {TargetModel} target
    */
   @action
+  @loading
   async delete(target) {
     try {
       await target.destroyRecord();
diff --git a/ui/core/app/routes/scopes/scope/projects/project/targets/target/add-host-sets.js b/ui/core/app/routes/scopes/scope/projects/project/targets/target/add-host-sets.js
index cedda2034..5736ae317 100644
--- a/ui/core/app/routes/scopes/scope/projects/project/targets/target/add-host-sets.js
+++ b/ui/core/app/routes/scopes/scope/projects/project/targets/target/add-host-sets.js
@@ -2,6 +2,7 @@ import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { all } from 'rsvp';
+import loading from 'ember-loading/decorator';
 
 export default class ScopesScopeProjectsProjectTargetsTargetAddHostSetsRoute extends Route {
   // =services
@@ -70,6 +71,7 @@ export default class ScopesScopeProjectsProjectTargetsTargetAddHostSetsRoute ext
   // =actions
 
   @action
+  @loading
   async save(target, hostSetIDs) {
     try {
       await target.addHostSets(hostSetIDs);
diff --git a/ui/core/app/routes/scopes/scope/projects/project/targets/target/host-sets.js b/ui/core/app/routes/scopes/scope/projects/project/targets/target/host-sets.js
index c0678f8da..1633c5713 100644
--- a/ui/core/app/routes/scopes/scope/projects/project/targets/target/host-sets.js
+++ b/ui/core/app/routes/scopes/scope/projects/project/targets/target/host-sets.js
@@ -2,6 +2,7 @@ import Route from '@ember/routing/route';
 import { all, hash } from 'rsvp';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
+import loading from 'ember-loading/decorator';
 
 export default class ScopesScopeProjectsProjectTargetsTargetHostSetsRoute extends Route {
   // =services
@@ -53,6 +54,7 @@ export default class ScopesScopeProjectsProjectTargetsTargetHostSetsRoute extend
    * @param {HostSetModel} hostSet
    */
   @action
+  @loading
   async removeHostSet(target, hostSet) {
     try {
       await target.removeHostSet(hostSet.id);
diff --git a/ui/core/app/routes/scopes/scope/roles.js b/ui/core/app/routes/scopes/scope/roles.js
index a3dd0bd66..84c6e7a8d 100644
--- a/ui/core/app/routes/scopes/scope/roles.js
+++ b/ui/core/app/routes/scopes/scope/roles.js
@@ -1,6 +1,7 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
+import loading from 'ember-loading/decorator';
 
 export default class ScopesScopeRolesRoute extends Route {
   // =services
@@ -44,6 +45,7 @@ export default class ScopesScopeRolesRoute extends Route {
    * @param {RoleModel} role
    */
   @action
+  @loading
   async save(role) {
     const { isNew } = role;
     try {
@@ -64,6 +66,7 @@ export default class ScopesScopeRolesRoute extends Route {
    * @param {RoleModel} role
    */
   @action
+  @loading
   async delete(role) {
     try {
       await role.destroyRecord();
diff --git a/ui/core/app/routes/scopes/scope/roles/role/add-principals.js b/ui/core/app/routes/scopes/scope/roles/role/add-principals.js
index e5ff631ff..6d0bb1d46 100644
--- a/ui/core/app/routes/scopes/scope/roles/role/add-principals.js
+++ b/ui/core/app/routes/scopes/scope/roles/role/add-principals.js
@@ -2,6 +2,7 @@ import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { hash } from 'rsvp';
+import loading from 'ember-loading/decorator';
 
 export default class ScopesScopeRolesRoleAddPrincipalsRoute extends Route {
   // =services
@@ -57,6 +58,7 @@ export default class ScopesScopeRolesRoleAddPrincipalsRoute extends Route {
    * @param {[string]} principalIDs
    */
   @action
+  @loading
   async addPrincipals(role, principalIDs) {
     try {
       await role.addPrincipals(principalIDs);
diff --git a/ui/core/app/routes/scopes/scope/roles/role/grants.js b/ui/core/app/routes/scopes/scope/roles/role/grants.js
index ac73cf1ea..d09901515 100644
--- a/ui/core/app/routes/scopes/scope/roles/role/grants.js
+++ b/ui/core/app/routes/scopes/scope/roles/role/grants.js
@@ -1,6 +1,7 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
+import loading from 'ember-loading/decorator';
 
 export default class ScopesScopeRolesRoleGrantsRoute extends Route {
   // =services
@@ -54,6 +55,7 @@ export default class ScopesScopeRolesRoleGrantsRoute extends Route {
    * @param {RoleModel} role
    */
   @action
+  @loading
   async save(role) {
     try {
       await role.saveGrants();
diff --git a/ui/core/app/routes/scopes/scope/roles/role/principals.js b/ui/core/app/routes/scopes/scope/roles/role/principals.js
index 3337b3437..00cc77303 100644
--- a/ui/core/app/routes/scopes/scope/roles/role/principals.js
+++ b/ui/core/app/routes/scopes/scope/roles/role/principals.js
@@ -2,6 +2,7 @@ import Route from '@ember/routing/route';
 import { all } from 'rsvp';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
+import loading from 'ember-loading/decorator';
 
 export default class ScopesScopeRolesRolePrincipalsRoute extends Route {
   // =services
@@ -60,6 +61,7 @@ export default class ScopesScopeRolesRolePrincipalsRoute extends Route {
    * @param {UserModel, GroupModel} principal
    */
   @action
+  @loading
   async removePrincipal(principal) {
     try {
       const role = this.modelFor('scopes.scope.roles.role');
diff --git a/ui/core/app/routes/scopes/scope/users.js b/ui/core/app/routes/scopes/scope/users.js
index 46847ddc3..bc6b6cf02 100644
--- a/ui/core/app/routes/scopes/scope/users.js
+++ b/ui/core/app/routes/scopes/scope/users.js
@@ -1,6 +1,7 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
+import loading from 'ember-loading/decorator';
 
 export default class ScopesScopeUsersRoute extends Route {
   // =services
@@ -45,6 +46,7 @@ export default class ScopesScopeUsersRoute extends Route {
    * @param {Event} e
    */
   @action
+  @loading
   async save(user) {
     const { isNew } = user;
     try {
@@ -65,6 +67,7 @@ export default class ScopesScopeUsersRoute extends Route {
    * @param {UserModel} user
    */
   @action
+  @loading
   async delete(user) {
     try {
       await user.destroyRecord();