diff --git a/packages/core-api/src/lib/loginPopup.test.ts b/packages/core-api/src/lib/loginPopup.test.ts
index 6527618ef7..6b3b49c781 100644
--- a/packages/core-api/src/lib/loginPopup.test.ts
+++ b/packages/core-api/src/lib/loginPopup.test.ts
@@ -161,6 +161,7 @@ describe('showLoginPopup', () => {
       source: popupMock,
       origin: 'origin',
       data: {
+        type: 'config_info',
         targetOrigin: 'http://localhost',
       },
     } as MessageEvent);
@@ -198,6 +199,7 @@ describe('showLoginPopup', () => {
       source: popupMock,
       origin: 'origin',
       data: {
+        type: 'config_info',
         targetOrigin: 'http://differenthost',
       },
     } as MessageEvent);
diff --git a/packages/core-api/src/lib/loginPopup.ts b/packages/core-api/src/lib/loginPopup.ts
index 5c6d424363..00a5efce66 100644
--- a/packages/core-api/src/lib/loginPopup.ts
+++ b/packages/core-api/src/lib/loginPopup.ts
@@ -95,7 +95,7 @@ export function showLoginPopup(options: LoginPopupOptions): Promise<any> {
       }
       const { data } = event;
 
-      if (data.targetOrigin) {
+      if (data.type === 'config_info') {
         targetOrigin = data.targetOrigin;
         return;
       }
diff --git a/plugins/auth-backend/src/lib/flow/authFlowHelpers.ts b/plugins/auth-backend/src/lib/flow/authFlowHelpers.ts
index 5aba427905..22ffc7af88 100644
--- a/plugins/auth-backend/src/lib/flow/authFlowHelpers.ts
+++ b/plugins/auth-backend/src/lib/flow/authFlowHelpers.ts
@@ -53,7 +53,7 @@ export const postMessageResponse = (
   const script = `
     var authResponse = decodeURIComponent('${base64Data}');
     var origin = decodeURIComponent('${base64Origin}');
-    var originInfo = {'targetOrigin': origin};
+    var originInfo = {'type': 'config_info', 'targetOrigin': origin};
     (window.opener || window.parent).postMessage(originInfo, '*');
     (window.opener || window.parent).postMessage(JSON.parse(authResponse), origin);
     window.close();