diff --git a/app/Helpers/Mail/GmailTransportConfig.php b/app/Helpers/Mail/GmailTransportConfig.php
index 1672d648ca54..261331c30f9e 100644
--- a/app/Helpers/Mail/GmailTransportConfig.php
+++ b/app/Helpers/Mail/GmailTransportConfig.php
@@ -49,10 +49,17 @@ class GmailTransportConfig
 
 /********************* We may need to fetch a new token on behalf of the client ******************************/
 
+        $query = [
+            'email' => 'david@invoicninja.com',
+            'oauth_provider_id'=>'google'
+        ];
+
+        $user = MultiDB::hasUser($query);
+
 		$transport = (new Swift_SmtpTransport('smtp.gmail.com', 587, 'tls'))
 		    ->setAuthMode('XOAUTH2')
-		    ->setUsername('turbo124@gmail.com')
-		    ->setPassword('');
+		    ->setUsername($user->email)
+		    ->setPassword($user->oauth_user_token);
 
 		// set new swift mailer
 		Mail::setSwiftMailer(new \Swift_Mailer($transport));
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 7f18b08849c3..9f7e09ec5e5a 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -307,6 +307,8 @@ class LoginController extends BaseController
                 'oauth_provider_id' => $provider
             ];
 
+            MultiDB::setDefaultDatabase();
+            
             $account = CreateAccount::dispatchNow($new_account);
 
             Auth::login($account->default_company->owner(), true);
diff --git a/app/Libraries/MultiDB.php b/app/Libraries/MultiDB.php
index cd445e018f6d..b7d0915453f8 100644
--- a/app/Libraries/MultiDB.php
+++ b/app/Libraries/MultiDB.php
@@ -201,5 +201,10 @@ class MultiDB
         config(['database.default' => $database]);
     }
 
+    public static function setDefaultDatabase()
+    {
+        config(['database.default' => config('ninja.db.default')]);
+    }
+
 
 }
\ No newline at end of file
diff --git a/routes/api.php b/routes/api.php
index eee4d6160813..042d1416cb00 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -111,5 +111,6 @@ Route::group(['middleware' => ['api_db','api_secret_check','token_auth'], 'prefi
    Route::post('support/messages/send', 'Support\Messages\SendingController');
 });
 
+Route::get('test_email', 'GmailTransportConfig');
 
 Route::fallback('BaseController@notFound');