diff --git a/app/Http/Controllers/ConnectedAccountController.php b/app/Http/Controllers/ConnectedAccountController.php
index e6ec51c383ac..d74e8c43b0e5 100644
--- a/app/Http/Controllers/ConnectedAccountController.php
+++ b/app/Http/Controllers/ConnectedAccountController.php
@@ -115,7 +115,6 @@ class ConnectedAccountController extends BaseController
             $timeout = auth()->user()->company()->default_password_timeout;
             Cache::put(auth()->user()->hashed_id.'_logged_in', Str::random(64), $timeout);
 
-
             return $this->itemResponse(auth()->user());
 
         }
@@ -126,6 +125,8 @@ class ConnectedAccountController extends BaseController
         ->header('X-Api-Version', config('ninja.minimum_client_version'));
     }
 
+
+
     public function handleGmailOauth(Request $request)
     {
 
@@ -162,6 +163,8 @@ class ConnectedAccountController extends BaseController
             auth()->user()->email_verified_at = now();
             auth()->user()->save();
             
+            $this->activateGmail(auth()->user());
+
             return $this->itemResponse(auth()->user());
 
         }
@@ -172,4 +175,19 @@ class ConnectedAccountController extends BaseController
         ->header('X-Api-Version', config('ninja.minimum_client_version'));
 
     }
+
+    private function activateGmail(User $user)
+    {
+        $company = $user->company();
+        $settings = $company->settings;
+
+        if($settings->email_sending_method == 'default')
+        {
+            $settings->email_sending_method = 'gmail';
+            $settings->gmail_sending_user_id = (string)$user->hashed_id;
+
+            $company->settings = $settings;
+            $company->save();
+        }    
+    }
 }