diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 2385a9b2e..bd4aa8893 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -90,7 +90,6 @@ class LoginController extends Controller
         //Search for user in the database
         $authUser = User::where('character_id', $eve_user->id)->first();
         if($authUser) {
-            /*
             DB::table('users')->where('character_id', $eve_user->id)->update([
                 'name' => $eve_user->getName(),
                 'email' => null,
@@ -103,7 +102,6 @@ class LoginController extends Controller
                 'refresh_token' => $eve_user->refreshToken,
                 'scopes' => $eve_user->user['Scopes'],
             ]);
-            */
 
             return $authUser;
         } else {
@@ -138,13 +136,6 @@ class LoginController extends Controller
         $configuration = Configuration::getInstance();
         $configuration->cache = NullCache::class;
 
-        //Prepare an authentication container for ESI
-        $authentication = new EsiAuthentication([
-            'client_id' => env('EVEONLINE_CLIENT_ID'),
-            'secret' => env('EVEONLINE_CLIENT_SECRET'),
-            'refresh_token' => $refreshToken,
-        ]);
-
         // Instantiate a new ESI instance
         $esi = new Eseye();
 
diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
index 1bf6c9da1..559d998df 100644
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -18,10 +18,10 @@ class CreateUsersTable extends Migration
             $table->string('name');
             $table->string('character_id');
             $table->string('avatar');
-            $table->string('access_token');
-            $table->string('refresh_token');
+            $table->string('access_token')->nullable();
+            $table->string('refresh_token')->nullable();
             $table->integer('inserted_at')->default(0);
-            $table->integer('expires_in');
+            $table->integer('expires_in')->default(0);
             $table->string('owner_hash');
             $table->string('user_type')->default('Guest');
             $table->text('scopes')->default('publicData');