diff --git a/www-api/app/Models/ExternalOAuth2Model.php b/www-api/app/Models/ExternalOAuth2Model.php
index 2c549adb..7480b67b 100644
--- a/www-api/app/Models/ExternalOAuth2Model.php
+++ b/www-api/app/Models/ExternalOAuth2Model.php
@@ -26,8 +26,13 @@ class ExternalOAuth2Model extends Model
 
                       case 'FACEBOOK':
                         log_message('critical', "Reading prepareOauthEndPointData -> ".$endpoint );
-                        $this->facebookOAuthCodeExchange($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->facebookOAuthCodeExchange($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 =[];