diff --git a/app/pods/protected/users/changepassword/controller.js b/app/pods/protected/users/changepassword/controller.js
index a157605..94ce219 100644
--- a/app/pods/protected/users/changepassword/controller.js
+++ b/app/pods/protected/users/changepassword/controller.js
@@ -16,6 +16,7 @@ export default Ember.Controller.extend({
       let options = {
         method: 'POST',
         data: {
+          id: this.get('session.currentUser.id'),
           password: this.get('password'),
         },
       };
diff --git a/app/pods/protected/users/show/route.js b/app/pods/protected/users/show/route.js
index 1830dc1..e812128 100644
--- a/app/pods/protected/users/show/route.js
+++ b/app/pods/protected/users/show/route.js
@@ -4,13 +4,12 @@ export default Ember.Route.extend({
   beforeModel: function(transition) {
     this._super(transition);
 
-    if (this.get('session.currentUser.role') !== 'A') {
+    this.get('session.currentUser').then((currentUser) => {
       let user_id = transition.params['protected.users.show'].user_id;
-      let currentUser_id = this.get('session.currentUser.id')
-      if (currentUser_id !== user_id) {
-        this.transitionTo('protected.users.show', currentUser_id);
+      if (!currentUser.get('isAdmin') && currentUser.get('id') !== user_id) {
+        this.transitionTo('protected.users.index');
       }
-    }
+    })
   },
 
   model: function(params) {