diff --git a/app/components/role/add.js b/app/components/role/add.js
index c31acd02343ee56b537b6877137e23820c91e11a..48c903d1ee0e3d2069a9406a4704e4f20cea79eb 100644
--- a/app/components/role/add.js
+++ b/app/components/role/add.js
@@ -34,13 +34,13 @@ class AddRoleComponent extends Component {
       this.new_role.save();
     }
 
-    this.router.transitionTo('roles');
+    this.router.transitionTo('authenticated.roles');
   }
 
   @action
   onCancel() {
     this.new_role.unloadRecord();
-    this.router.transitionTo('roles');
+    this.router.transitionTo('authenticated.roles');
   }
 }
 
diff --git a/app/components/role/edit.js b/app/components/role/edit.js
index de7ceb7bc62ed267400d2c7cf49f7faa9559ebd6..25f6fafed0ca50b510aa6f058445332ad8849e06 100644
--- a/app/components/role/edit.js
+++ b/app/components/role/edit.js
@@ -17,7 +17,7 @@ class EditRoleComponent extends Component {
     let role = this.args.role;
 
     role.save();
-    this.router.transitionTo('roles');
+    this.router.transitionTo('authenticated.roles');
   }
 }
 
diff --git a/app/components/user/change_password.hbs b/app/components/user/change_password.hbs
index b4f74d88e2daff8d1f47d9b6847e2063ab1929fc..d36c0bacaa3c82fc588a4d6fb841e6ebc06411ca 100644
--- a/app/components/user/change_password.hbs
+++ b/app/components/user/change_password.hbs
@@ -21,5 +21,5 @@
     @text="Change Password"
     @disabled={{this.disabled}}
     @onClick={{this.onSubmit}} />
-  <Button::Cancel @route="users"/>
+  <Button::Cancel @route="authenticated.users"/>
 </div>
diff --git a/app/components/user/change_password.js b/app/components/user/change_password.js
index 951fc42274a57801202eae2a73d57b3e9d1d233a..cb4b6241c45728eece3aec0be523bfecdd6dc44c 100644
--- a/app/components/user/change_password.js
+++ b/app/components/user/change_password.js
@@ -30,7 +30,7 @@ class ChangeUserPasswordComponent extends Component {
     let user = this.args.user;
 
     user.changePassword(this.new_password_1);
-    this.router.transitionTo('users');
+    this.router.transitionTo('authenticated.users');
   }
 }
 
diff --git a/app/components/user/edit.hbs b/app/components/user/edit.hbs
index 95abb3065de5dc53e2bc2ba432eb942a91263f45..50126c346a6ec1e516d8649ecaa7a90804e70206 100644
--- a/app/components/user/edit.hbs
+++ b/app/components/user/edit.hbs
@@ -77,5 +77,5 @@
 <div class="mb-3">
   <Button::Submit
     @onClick={{this.onSubmit}} />
-  <Button::Cancel @route="users"/>
+  <Button::Cancel @route="authenticated.users"/>
 </div>
diff --git a/app/components/user/edit.js b/app/components/user/edit.js
index 7eb1ddc3e10b2082f051f1592eb1628b1a4d6c05..59751888eb9dcd8ed089da2b6c3ae0607b5cd4b4 100644
--- a/app/components/user/edit.js
+++ b/app/components/user/edit.js
@@ -13,7 +13,7 @@ class EditUserComponent extends Component {
     let user = this.args.user;
 
     user.save();
-    this.router.transitionTo('users');
+    this.router.transitionTo('authenticated.users');
   }
 }