diff --git a/plugins/auth-backend/src/lib/passport/PassportStrategyHelper.ts b/plugins/auth-backend/src/lib/passport/PassportStrategyHelper.ts
index 28f15ee9e8..079f44151a 100644
--- a/plugins/auth-backend/src/lib/passport/PassportStrategyHelper.ts
+++ b/plugins/auth-backend/src/lib/passport/PassportStrategyHelper.ts
@@ -190,19 +190,17 @@ type ProviderStrategy = {
 export const executeFetchUserProfileStrategy = async (
   providerStrategy: passport.Strategy,
   accessToken: string,
-  idToken?: string,
-): Promise<ProfileInfo> => {
+): Promise<passport.Profile> => {
   return new Promise((resolve, reject) => {
     const anyStrategy = (providerStrategy as unknown) as ProviderStrategy;
     anyStrategy.userProfile(
       accessToken,
-      (error: Error, passportProfile: passport.Profile) => {
+      (error: Error, rawProfile: passport.Profile) => {
         if (error) {
           reject(error);
+        } else {
+          resolve(rawProfile);
         }
-
-        const profile = makeProfileInfo(passportProfile, idToken);
-        resolve(profile);
       },
     );
   });
diff --git a/plugins/auth-backend/src/providers/auth0/provider.ts b/plugins/auth-backend/src/providers/auth0/provider.ts
index 89f4f73300..1244820139 100644
--- a/plugins/auth-backend/src/providers/auth0/provider.ts
+++ b/plugins/auth-backend/src/providers/auth0/provider.ts
@@ -114,11 +114,11 @@ export class Auth0AuthProvider implements OAuthHandlers {
       req.scope,
     );
 
-    const profile = await executeFetchUserProfileStrategy(
+    const rawProfile = await executeFetchUserProfileStrategy(
       this._strategy,
       accessToken,
-      params.id_token,
     );
+    const profile = makeProfileInfo(rawProfile, params.id_token);
 
     return this.populateIdentity({
       providerInfo: {
diff --git a/plugins/auth-backend/src/providers/google/provider.ts b/plugins/auth-backend/src/providers/google/provider.ts
index fa42988c98..12d882cbb0 100644
--- a/plugins/auth-backend/src/providers/google/provider.ts
+++ b/plugins/auth-backend/src/providers/google/provider.ts
@@ -127,11 +127,11 @@ export class GoogleAuthProvider implements OAuthHandlers {
       req.scope,
     );
 
-    const profile = await executeFetchUserProfileStrategy(
+    const rawProfile = await executeFetchUserProfileStrategy(
       this._strategy,
       accessToken,
-      params.id_token,
     );
+    const profile = makeProfileInfo(rawProfile, params.id_token);
 
     return this.populateIdentity({
       providerInfo: {
diff --git a/plugins/auth-backend/src/providers/microsoft/provider.ts b/plugins/auth-backend/src/providers/microsoft/provider.ts
index 57f2ffcbd5..7b110e5f1a 100644
--- a/plugins/auth-backend/src/providers/microsoft/provider.ts
+++ b/plugins/auth-backend/src/providers/microsoft/provider.ts
@@ -142,11 +142,11 @@ export class MicrosoftAuthProvider implements OAuthHandlers {
       req.scope,
     );
 
-    const profile = await executeFetchUserProfileStrategy(
+    const rawProfile = await executeFetchUserProfileStrategy(
       this._strategy,
       accessToken,
-      params.id_token,
     );
+    const profile = makeProfileInfo(rawProfile, params.id_token);
     const photo = await this.getUserPhoto(accessToken);
     if (photo) {
       profile.picture = photo;
diff --git a/plugins/auth-backend/src/providers/oauth2/provider.ts b/plugins/auth-backend/src/providers/oauth2/provider.ts
index 93f9fad2aa..a5d3f96fdf 100644
--- a/plugins/auth-backend/src/providers/oauth2/provider.ts
+++ b/plugins/auth-backend/src/providers/oauth2/provider.ts
@@ -124,11 +124,11 @@ export class OAuth2AuthProvider implements OAuthHandlers {
       refreshToken: updatedRefreshToken,
     } = refreshTokenResponse;
 
-    const profile = await executeFetchUserProfileStrategy(
+    const rawProfile = await executeFetchUserProfileStrategy(
       this._strategy,
       accessToken,
-      params.id_token,
     );
+    const profile = makeProfileInfo(rawProfile, params.id_token);
 
     return this.populateIdentity({
       providerInfo: {
diff --git a/plugins/auth-backend/src/providers/okta/provider.ts b/plugins/auth-backend/src/providers/okta/provider.ts
index ba2c594550..fbca780571 100644
--- a/plugins/auth-backend/src/providers/okta/provider.ts
+++ b/plugins/auth-backend/src/providers/okta/provider.ts
@@ -134,11 +134,11 @@ export class OktaAuthProvider implements OAuthHandlers {
       req.scope,
     );
 
-    const profile = await executeFetchUserProfileStrategy(
+    const rawProfile = await executeFetchUserProfileStrategy(
       this._strategy,
       accessToken,
-      params.id_token,
     );
+    const profile = makeProfileInfo(rawProfile, params.id_token);
 
     return this.populateIdentity({
       providerInfo: {
diff --git a/plugins/auth-backend/src/providers/onelogin/provider.ts b/plugins/auth-backend/src/providers/onelogin/provider.ts
index d23a48776e..5549db06c6 100644
--- a/plugins/auth-backend/src/providers/onelogin/provider.ts
+++ b/plugins/auth-backend/src/providers/onelogin/provider.ts
@@ -114,11 +114,11 @@ export class OneLoginProvider implements OAuthHandlers {
       req.scope,
     );
 
-    const profile = await executeFetchUserProfileStrategy(
+    const rawProfile = await executeFetchUserProfileStrategy(
       this._strategy,
       accessToken,
-      params.id_token,
     );
+    const profile = makeProfileInfo(rawProfile, params.id_token);
 
     return this.populateIdentity({
       providerInfo: {