diff --git a/app/Console/Commands/Users/PurgeUsers.php b/app/Console/Commands/Users/PurgeUsers.php
index c38e0a9a1..7a70020b0 100644
--- a/app/Console/Commands/Users/PurgeUsers.php
+++ b/app/Console/Commands/Users/PurgeUsers.php
@@ -148,6 +148,10 @@ class PurgeUsers extends Command
                             'character_id' => $user->character_id,
                         ])->delete();
 
+                        UserAlt::where([
+                            'main_id' => $user->character_id,
+                        ])->delete();
+
                         //Delete the user from the user table
                         User::where([
                             'character_id' => $user->character_id,
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index d9a1616e9..aa04eed46 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -133,10 +133,8 @@ class LoginController extends Controller
             $newAlt->character_id = $user->id;
             $newAlt->avatar = $user->avatar;
             $newAlt->access_token = $user->token;
-            if(isset($user->refresh_token)) {
-                $newAlt->refresh_token = $user->refresh_token;
-            }
             $newAlt->owner_hash = $user->owner_hash;
+            $newAlt->inserted_at = time();
             $newAlt->expires_in = $user->expiresIn;
             $newAlt->save();
             return 1;
@@ -203,6 +201,7 @@ class LoginController extends Controller
             'character_id' => $eve_user->getId(),
             'access_token' => $eve_user->token,
             'refresh_token' => $eve_user->refreshToken,
+            'inserted_at' => time(),
             'expires_in' => $eve_user->expiresIn,
         ]);
     }
@@ -215,6 +214,7 @@ class LoginController extends Controller
         $token->character_id  = $eve_user->id;
         $token->access_token = $eve_user->token;
         $token->refresh_token = $eve_user->refreshToken;
+        $token->inserted_at = time();
         $token->expires_in = $eve_user->expiresIn;
         $token->save();
     }
@@ -260,6 +260,7 @@ class LoginController extends Controller
             'avatar' => $eve_user->avatar,
             'owner_hash' => $eve_user->owner_hash,
             'character_id' => $eve_user->getId(),
+            'inserted_at' => time(),
             'expires_in' => $eve_user->expiresIn,
             'access_token' => $eve_user->token,
             'user_type' => $this->GetAccountType(null, $eve_user->id),
diff --git a/app/Models/Esi/EsiToken.php b/app/Models/Esi/EsiToken.php
index 2936fed85..d5f5f6f5d 100644
--- a/app/Models/Esi/EsiToken.php
+++ b/app/Models/Esi/EsiToken.php
@@ -24,6 +24,7 @@ class EsiToken extends Model
         'character_id',
         'access_token',
         'refresh_token',
+        'inserted_at',
         'expires_in',
     ];
 
diff --git a/app/Models/User/User.php b/app/Models/User/User.php
index 8db351f17..310a3e5e0 100644
--- a/app/Models/User/User.php
+++ b/app/Models/User/User.php
@@ -28,11 +28,8 @@ class User extends Authenticatable
         'character_id',
         'inserted_at',
         'expires_in', 
-        'access_token', 
-        'refresh_token', 
+        'access_token',
         'user_type',
-        'scopes',
-        'role',
     ];
 
     protected $table = 'users';
@@ -57,6 +54,10 @@ class User extends Authenticatable
         return $this->hasMany('App\Models\Esi\EsiScope', 'character_id');
     }
 
+    public function userAlts() {
+        return $this->hasMany('App\Models\User\UserAlt', 'character_id', 'main_id');
+    }
+
     public function hasPermission($permission) {
         $found = UserPermission::where(['character_id' => $this->character_id, 'permission' => $permission])->get(['permission']);
         foreach($found as $foo) {
diff --git a/app/Models/User/UserAlt.php b/app/Models/User/UserAlt.php
index 4a66c0648..cbb623dec 100644
--- a/app/Models/User/UserAlt.php
+++ b/app/Models/User/UserAlt.php
@@ -22,9 +22,12 @@ class UserAlt extends Model
         'character_id',
         'avatar',
         'access_token',
-        'refresh_token',
         'inserted_at',
         'expires_in',
         'owner_hash',
     ];
+
+    public function mainCharacter() {
+        return $this->belongsTo('App\Models\User\User', 'character_id');
+    }
 }