diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index a063ab9f4..37c4066c2 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -84,7 +84,7 @@ class LoginController extends Controller
     public function handleProviderCallback() {
         //Get the sso user from the socialite driver
         $ssoUser = Socialite::driver('eveonline')->user();
-
+        dd($ssoUser);
         if(Auth::check()) {
             //If a refresh token is present, then we are doing a scope callback
             //to update scopes for an access token
diff --git a/app/Providers/EveOnlineOAuthProvider.php b/app/Providers/EveOnlineOAuthProvider.php
index 713db7040..68d11e5e8 100644
--- a/app/Providers/EveOnlineOAuthProvider.php
+++ b/app/Providers/EveOnlineOAuthProvider.php
@@ -52,25 +52,15 @@ class EveOnlineOAuthProvider extends AbstractProvider implements ProviderInterfa
      */
     protected function mapUserToObject(array $user) {
 
-        dd($user);
-
         return (new User)->setRaw($user)->map([
             'id' => $user['CharacterID'],
             'name' => $user['CharacterName'],
-            'owner_hash' => $user['CharacterOwnerHash'],
+            'nickname' => $user['CharacterName'],
+            'character_owner_hash' => $user['CharacterOwnerHash'],
             'avatar' => 'https://image.eveonline.com/Character/' . $user['CharacterID'] . '_128.jpg',
+            'token_type' => $user['TokenType'],
+            'expires_on' => $user['ExpiresOn'],
         ]);
-        /*
-        return (new User)->setRaw($user)->map([
-            'id'                   => $character_id,
-            'name'                 => $user['name'],
-            'nickname'             => $user['name'],
-            'character_owner_hash' => $user['owner'],
-            'scopes'               => is_array($user['scp']) ? $user['scp'] : [$user['scp']],
-            'expires_on'           => $user['exp'],
-            'avatar'               => $avatar,
-        ]);
-        */
     }
 
     /**