diff --git a/www-api/app/Models/ExternalOAuth2Model.php b/www-api/app/Models/ExternalOAuth2Model.php
index 7480b67b..5ba7209b 100644
--- a/www-api/app/Models/ExternalOAuth2Model.php
+++ b/www-api/app/Models/ExternalOAuth2Model.php
@@ -13,8 +13,13 @@ class ExternalOAuth2Model extends Model
                 switch($in["auth_type"]){
                     case 'GOOGLE':
                       log_message('critical', "Reading prepareOauthEndPointData -> ".$endpoint );
-                      $this->gooleOAuthCodeExchange($in, $local_out);
-                        log_message('critical', "LET SEEEEE TOKEN prepareOauthEndPointData -> ".$local_out["access_token"] );
+                      // Skip token exchange if we habe the access token already
+                      if (isset($in["access_token"]) && $in["access_token"]!="") {
+                        $local_out["access_token"] = $in["access_token"];
+                      } else {
+                          $this->gooleOAuthCodeExchange($in, $local_out);
+                      }
+                      log_message('critical', "LET SEEEEE TOKEN prepareOauthEndPointData -> ".$local_out["access_token"] );
                       if ( isset($local_out["access_token"])){
                           log_message('critical', "XXXXXXXXXXXXXXXXX prepareOauthEndPointData -> ".$endpoint );
                           $l_out =[];