diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 03d06565f5a0..2798e47ccb3e 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -481,10 +481,14 @@ class LoginController extends BaseController
 
 //server_auth_code
         $client = new \Google_Client();
-        //$accessToken = $client->fetchAccessTokenWithAuthCode(request()->input('server_auth_code'));
-        //$client->setAccessToken($accessToken);
+        $client->setClientId(config('ninja.auth.google.client_id'));
+        $client->setClientSecret(config('ninja.auth.google.client_secret'));
+
+        $accessToken = $client->fetchAccessTokenWithAuthCode(request()->input('server_auth_code'));
+        info($accessToken);
         
-        $client->setAccessToken(request()->input('access_token'));
+        $client->setAccessToken($accessToken);
+        //$client->setAccessToken(request()->input('access_token'));
         $refresh_token = $client->getRefreshToken();
 
             $name = OAuth::splitName($google->harvestName($user));
diff --git a/config/ninja.php b/config/ninja.php
index 9a524a6f8d23..ca274ea3d2cc 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -147,5 +147,11 @@ return [
         'enterprise' => [
             'daily_emails' => 200,
         ]
+    ],
+    'auth' => [
+        'google' => [
+            'client_id' => env('GOOGLE_CLIENT_ID', ''),
+            'client_secret' => env('GOOGLE_CLIENT_SECRET','')
+        ]
     ]
 ];