diff --git a/client/src/actions/session-actions.js b/client/src/actions/session-actions.js
index 2e552d58..9bec3100 100644
--- a/client/src/actions/session-actions.js
+++ b/client/src/actions/session-actions.js
@@ -54,7 +54,7 @@ export default {
                 data: {
                     userId: rememberData.userId,
                     rememberToken: rememberData.token,
-                    staff: (rememberData.isStaff === "true") ? 1 : 0,
+                    staff: rememberData.isStaff,
                     remember: 1,
                 }
             }).then((result) => {
diff --git a/client/src/reducers/session-reducer.js b/client/src/reducers/session-reducer.js
index 552c828a..0b0be3d3 100644
--- a/client/src/reducers/session-reducer.js
+++ b/client/src/reducers/session-reducer.js
@@ -95,7 +95,7 @@ class SessionReducer extends Reducer {
             sessionStore.storeRememberData({
                 token: resultData.rememberToken,
                 userId: resultData.userId,
-                isStaff: resultData.staff,
+                isStaff: resultData.staff ? 1 : 0,
                 expiration: resultData.rememberExpiration
             });
         }
diff --git a/server/controllers/user/login.php b/server/controllers/user/login.php
index 9e77c5c2..c5eba95d 100755
--- a/server/controllers/user/login.php
+++ b/server/controllers/user/login.php
@@ -120,12 +120,15 @@ class LoginController extends Controller {
         if($rememberToken) {
             $sessionCookie = SessionCookie::getDataStore($rememberToken, 'token');
             $userId = Controller::request('userId');
-            $isStaff = Controller::request('staff');
-            $loggedInstance = $isStaff ? $sessionCookie->staff : $sessionCookie->user;
+            $isStaff = !!Controller::request('staff');
 
-            if ((!$sessionCookie->isNull()) && ($userId === $loggedInstance->id) && ($isStaff === $sessionCookie->isStaff)) {
-                $userInstance = $loggedInstance;
-                $sessionCookie->delete();
+            if(!$sessionCookie->isNull()) {
+                $loggedInstance = $isStaff ? $sessionCookie->staff : $sessionCookie->user;
+
+                if(($userId == $loggedInstance->id) && ($isStaff == $sessionCookie->isStaff)) {
+                    $userInstance = $loggedInstance;
+                    $sessionCookie->delete();
+                }
             }
         }
 
diff --git a/tests/user/login.rb b/tests/user/login.rb
index b216a04c..6dd3c492 100644
--- a/tests/user/login.rb
+++ b/tests/user/login.rb
@@ -89,7 +89,6 @@ describe '/user/login' do
         (result['status']).should.equal('success')
 
         @rememberToken = result['data']['rememberToken']
-        puts result['data']
         @staffId = result['data']['userId']
 
         request('/user/logout', {})