diff --git a/client/src/sagas/core/services/users.js b/client/src/sagas/core/services/users.js
index b2a9ea4b..b950e2f0 100644
--- a/client/src/sagas/core/services/users.js
+++ b/client/src/sagas/core/services/users.js
@@ -110,17 +110,22 @@ export function* updateUserPassword(id, data) {
   yield put(actions.updateUserPassword(id, data));
 
   let user;
-  let accessToken;
+  let accessTokens;
 
   try {
-    ({ item: user, accessToken } = yield call(request, api.updateUserPassword, id, data));
+    ({ item: user, included: { accessTokens } = {} } = yield call(
+      request,
+      api.updateUserPassword,
+      id,
+      data,
+    ));
   } catch (error) {
     yield put(actions.updateUserPassword.failure(id, error));
     return;
   }
 
-  if (accessToken) {
-    yield call(setAccessToken, accessToken);
+  if (accessTokens && accessTokens[0]) {
+    yield call(setAccessToken, accessTokens[0]);
   }
 
   yield put(actions.updateUserPassword.success(user));
diff --git a/server/api/controllers/users/update-password.js b/server/api/controllers/users/update-password.js
index f64d01f0..aac537b8 100644
--- a/server/api/controllers/users/update-password.js
+++ b/server/api/controllers/users/update-password.js
@@ -70,8 +70,10 @@ module.exports = {
       const accessToken = sails.helpers.utils.createToken(user.id, user.passwordUpdatedAt);
 
       return {
-        accessToken,
         item: user,
+        included: {
+          accessTokens: [accessToken],
+        },
       };
     }