diff --git a/app/Http/Controllers/ClientPortal/SwitchCompanyController.php b/app/Http/Controllers/ClientPortal/SwitchCompanyController.php
index aa70285e642b..aa9c3d17a81f 100644
--- a/app/Http/Controllers/ClientPortal/SwitchCompanyController.php
+++ b/app/Http/Controllers/ClientPortal/SwitchCompanyController.php
@@ -15,6 +15,7 @@ namespace App\Http\Controllers\ClientPortal;
 use App\Http\Controllers\Controller;
 use App\Models\ClientContact;
 use App\Utils\Traits\MakesHash;
+use Illuminate\Support\Facades\Auth;
 
 class SwitchCompanyController extends Controller
 {
@@ -27,7 +28,7 @@ class SwitchCompanyController extends Controller
             ->where('id', $this->transformKeys($contact))
             ->first();
 
-        auth('contact')->login($client_contact, true);
+        Auth::guard('contact')->login($client_contact, true);
 
         return back();
     }
diff --git a/app/Jobs/Mail/BaseMailerJob.php b/app/Jobs/Mail/BaseMailerJob.php
index fdeb3e2ca92f..1ec1235c9034 100644
--- a/app/Jobs/Mail/BaseMailerJob.php
+++ b/app/Jobs/Mail/BaseMailerJob.php
@@ -39,7 +39,7 @@ class BaseMailerJob implements ShouldQueue
         $user = User::find($sending_user);
 
         $google = (new Google())->init();
-        $google->getClient()->setAccessToken($user->oauth_user_token);
+        $google->getClient()->setAccessToken(json_encode($user->oauth_user_token));
 
         if ($google->getClient()->isAccessTokenExpired()) {
             $google->refreshToken($user);
@@ -52,7 +52,7 @@ class BaseMailerJob implements ShouldQueue
         */
        
         Config::set('mail.driver', 'gmail');
-        Config::set('services.gmail.token', $user->oauth_user_token['access_token']);
+        Config::set('services.gmail.token', $user->oauth_user_token->access_token);
 
         (new MailServiceProvider(app()))->register();
 
diff --git a/app/Models/User.php b/app/Models/User.php
index 27df9d4bf42b..73c14a4adedf 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -95,7 +95,7 @@ class User extends Authenticatable implements MustVerifyEmail
     ];
 
     protected $casts = [
-        'oauth_user_token' => 'array',
+        'oauth_user_token' => 'object',
         'settings'         => 'object',
         'updated_at'       => 'timestamp',
         'created_at'       => 'timestamp',
diff --git a/database/migrations/2020_05_13_035355_add_google_refresh_token_to_users_table.php b/database/migrations/2020_05_13_035355_add_google_refresh_token_to_users_table.php
index 18367713a90d..0f4e1999d028 100644
--- a/database/migrations/2020_05_13_035355_add_google_refresh_token_to_users_table.php
+++ b/database/migrations/2020_05_13_035355_add_google_refresh_token_to_users_table.php
@@ -15,6 +15,7 @@ class AddGoogleRefreshTokenToUsersTable extends Migration
     {
         Schema::table('users', function (Blueprint $table) {
             $table->string('oauth_user_refresh_token')->nullable();
+            $table->text('oauth_user_token')->change();
         });
     }