diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 12fdc0689132..00bcbe33b4b0 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -733,6 +733,14 @@ class UserController extends BaseController
         $user->oauth_user_refresh_token = null;
         $user->save();
 
+        $company = $user->company();
+        $settings = $company->settings;
+        $settings->email_sending_method = "default";
+        $settings->gmail_sending_user_id = "0";
+
+        $company->settings = $settings;
+        $company->save();
+
         return $this->itemResponse($user->fresh());
 
     }
diff --git a/tests/Feature/ReminderTest.php b/tests/Feature/ReminderTest.php
index 798a93d471be..aeca3ffe8fd5 100644
--- a/tests/Feature/ReminderTest.php
+++ b/tests/Feature/ReminderTest.php
@@ -91,51 +91,6 @@ class ReminderTest extends TestCase
 
         $this->assertEquals(now()->addMonth()->format('Y-m-d'), Carbon::parse($this->invoice->next_send_date)->format('Y-m-d'));
 
-        // $next_send_date = Carbon::parse($this->invoice->next_send_date);
-        // $calculatedReminderDate = Carbon::parse($this->invoice->due_date)->subDays(4)->addSeconds($this->invoice->client->timezone_offset());
-
-        // nlog($next_send_date->format('Y-m-d h:i:s'));
-        // nlog($calculatedReminderDate->format('Y-m-d h:i:s'));
-
-        // $this->travelTo(now()->addDays(1));
-
-        // $reminder_template = $this->invoice->calculateTemplate('invoice');
-
-        // $this->assertEquals('reminder1', $reminder_template);
-
-        // $this->assertTrue($next_send_date->eq($calculatedReminderDate));
-
-        // $this->invoice->service()->touchReminder($reminder_template)->save();
-
-        // $this->assertNotNull($this->invoice->last_sent_date);
-        // $this->assertNotNull($this->invoice->reminder1_sent);
-        // $this->assertNotNull($this->invoice->reminder_last_sent);
-
-        // //calc next send date
-        // $this->invoice->service()->setReminder()->save();
-
-        // $next_send_date = Carbon::parse($this->invoice->next_send_date);
-        
-        // nlog($next_send_date->format('Y-m-d h:i:s'));
-
-        // $calculatedReminderDate = Carbon::parse($this->invoice->due_date)->subDays(2)->addSeconds($this->invoice->client->timezone_offset());
-        // $this->assertTrue($next_send_date->eq($calculatedReminderDate));
-
-        // $this->travelTo(now()->addDays(2));
-
-        // $reminder_template = $this->invoice->calculateTemplate('invoice');
-
-        // $this->assertEquals('reminder2', $reminder_template);
-        // $this->invoice->service()->touchReminder($reminder_template)->save();
-        // $this->assertNotNull($this->invoice->reminder2_sent);
-
-        // $this->invoice->service()->setReminder()->save();
-
-        // $next_send_date = Carbon::parse($this->invoice->next_send_date);
-        // $calculatedReminderDate = Carbon::parse($this->invoice->due_date)->addDays(3)->addSeconds($this->invoice->client->timezone_offset());
-        // $this->assertTrue($next_send_date->eq($calculatedReminderDate));
-
-        // nlog($next_send_date->format('Y-m-d h:i:s'));
     }