diff --git a/src/api/controllers/Auth.php b/src/api/controllers/Auth.php
index 91ea81e..bdb4d06 100644
--- a/src/api/controllers/Auth.php
+++ b/src/api/controllers/Auth.php
@@ -43,7 +43,7 @@ class Auth extends BaseController {
         $admin->default_board_id = 0;
         $admin->user_option_id = 0;
         $admin->last_login = 0;
-        $admin->active_token = '';
+        // $admin->active_token = '';
 
         $opts = R::dispense('useroption');
         $opts->new_tasks_at_bottom = true;
@@ -82,17 +82,17 @@ class Auth extends BaseController {
             return $response->withStatus(401);
         }
 
-        $user = R::load('user', $payload->uid);
-        if ($user->active_token !== $jwt) {
-            $user->active_token = '';
-            R::store($user);
-
-            return $response->withStatus(401);
-        }
+        // $user = R::load('user', $payload->uid);
+        // if ($user->active_token !== $jwt) {
+        //     $user->active_token = '';
+        //     R::store($user);
+        //
+        //     return $response->withStatus(401);
+        // }
 
         $jwt = self::createJwt($payload->uid, (int)$payload->mul);
-        $user->active_token = $jwt;
-        R::store($user);
+        // $user->active_token = $jwt;
+        // R::store($user);
 
         $response->getBody()->write($jwt);
 
@@ -146,7 +146,7 @@ class Auth extends BaseController {
                 'Go to Settings to create your first board.');
         }
 
-        $user->active_token = $jwt;
+        // $user->active_token = $jwt;
         $user->last_login = time();
         R::store($user);
 
@@ -176,10 +176,10 @@ class Auth extends BaseController {
 
         $user = R::load('user', $payload->uid);
 
-        if ($user->id) {
-            $user->active_token = '';
-            R::store($user);
-        }
+        // if ($user->id) {
+        //     $user->active_token = '';
+        //     R::store($user);
+        // }
 
         $this->dbLogger->logChange($user->id, $user->username . ' logged out',
             null, null, 'user', $user->id);
@@ -216,7 +216,7 @@ class Auth extends BaseController {
 
     private function sanitizeUser($user) {
         unset($user->password_hash);
-        unset($user->active_token);
+        // unset($user->active_token);
 
         return $user;
     }
diff --git a/src/api/controllers/Boards.php b/src/api/controllers/Boards.php
index 872bcfc..dea62b2 100644
--- a/src/api/controllers/Boards.php
+++ b/src/api/controllers/Boards.php
@@ -212,7 +212,7 @@ class Boards extends BaseController {
 
     private function cleanUser($user) {
         unset($user->password_hash);
-        unset($user->active_token);
+        // unset($user->active_token);
 
         return $user;
     }
diff --git a/src/api/controllers/Users.php b/src/api/controllers/Users.php
index 08b6ac1..65108a2 100644
--- a/src/api/controllers/Users.php
+++ b/src/api/controllers/Users.php
@@ -147,7 +147,7 @@ class Users extends BaseController {
             unset($data->old_password);
         }
 
-        $data->active_token = $user->active_token;
+        // $data->active_token = $user->active_token;
 
         if (isset($data->password) && $data->password !== '') {
             $data->password_hash =
@@ -369,7 +369,7 @@ class Users extends BaseController {
 
     private function cleanUser($user) {
         unset($user->password_hash);
-        unset($user->active_token);
+        // unset($user->active_token);
 
         $this->setBoardAccess($user);