diff --git a/app/Http/Controllers/Auth/EveLoginController.php b/app/Http/Controllers/Auth/EveLoginController.php
index db76491..714bbda 100644
--- a/app/Http/Controllers/Auth/EveLoginController.php
+++ b/app/Http/Controllers/Auth/EveLoginController.php
@@ -45,45 +45,25 @@ class EveLoginController extends Controller
             'iss' => $ssoUser['iss'],
             'region' => $ssoUser['region'],
             'tier' => $ssoUser['tier'],
+            'token' => $ssoUser->token,
+            'refreshToken' => $ssoUser->refreshToken ?? null,
+            'expiresIn' => $ssoUser->expiresIn ?? null,
         ];
 
         dd($temp);
 
         try {
             $ssoUser = Socialite::driver('eveonline')->user();
-            
-            $temp = [
-                'id' => $ssoUser->getId(),
-                'name' => $ssoUser['name'],
-                'nickname' => $ssoUser['name'],
-                'owner_hash' => $ssoUser['owner'],
-                'scopes' => is_array($ssoUser['scp']) ? $ssoUser['scp'] : [$user['scp']],
-                'expires_on' => $user['exp'],
-                'avatar' => 'https://image.eveonline.com/Character/' . $characterId . '_128.jpg',
-                'iss' => $user['iss'],
-                'region' => $user['region'],
-                'tier' => $user['tier'],
-            ];
-
-            dd($temp);
-
-            Log::info('SSO User:', [$ssoUser]);
-
-            $characterId = (int) $ssoUser->getId();
-            $characterName = $ssoUser->getName() ?: ($ssoUser->getNickname() ?? 'Unknown');
-
-            $raw = $ssoUser->user ?? [];
-
-            $characterOwnerHash =
-                $raw['CharacterOwnerHash']
-                ?? $raw['character_owner_hash']
-                ?? $raw['owner_hash']
-                ?? '';
 
+            $characterId = strtr($ssoUser['sub'], ['CHARACTER:EVE:' => '']);
+            $characterName = $ssoUser['name'];
+            $characterOwnerHash = $ssoUser['owner'];
+            $avatar = 'https://image.eveonline.com/Character/' . $characterId . '_128.jpg';
             $token = $ssoUser->token;
             $refreshToken = $ssoUser->refreshToken ?? null;
             $expiresIn = $ssoUser->expiresIn ?? null;
 
+            //Add user to the database
             $user = User::updateOrCreate(
                 ['character_id' => $characterId],
                 [
@@ -95,6 +75,10 @@ class EveLoginController extends Controller
                 ]
             );
 
+            //Add scopes to the scope database
+
+            //Add Esi Token to the token database
+
             // Always regenerate JWT on successful login
             $jwtService->forceRefresh($user);
 
diff --git a/app/Models/Auth/User.php b/app/Models/Auth/User.php
index 7ed6980..096191d 100644
--- a/app/Models/Auth/User.php
+++ b/app/Models/Auth/User.php
@@ -13,6 +13,7 @@ class User extends Authenticatable
         'character_owner_hash',
         'character_name',
         'character_id',
+        'avatar',
         'token',
         'refresh_token',
         'expiresIn',