diff --git a/.gitignore b/.gitignore
index d9522529da..37e29519d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@ whitesource.config.json
 plugin*.js
 core/dev-tools/latest_build.log
 core/dev-tools/simple-app
+core-modular/dev-tools/simple-app
 /full_eslint_report.html
 test/e2e-test-application/cypress/screenshots
 **/.DS_Store
diff --git a/container/src/services/container.service.ts b/container/src/services/container.service.ts
index ac67dbcc20..dc953efb1b 100644
--- a/container/src/services/container.service.ts
+++ b/container/src/services/container.service.ts
@@ -117,7 +117,7 @@ export class ContainerService {
                     },
                     authData: targetCnt.authData || {}
                   },
-                  target.origin
+                  event.origin
                 );
                 break;
               case LuigiInternalMessageID.NAVIGATION_REQUEST:
diff --git a/container/test/services/container.service.spec.ts b/container/test/services/container.service.spec.ts
index 0b6f1740ef..d18108c95c 100644
--- a/container/test/services/container.service.spec.ts
+++ b/container/test/services/container.service.spec.ts
@@ -73,6 +73,7 @@ describe('getContainerManager messageListener', () => {
 
   it('test get context message', () => {
     const event = {
+      origin: '*',
       source: cw,
       data: {
         msg: LuigiInternalMessageID.GET_CONTEXT,
@@ -88,7 +89,6 @@ describe('getContainerManager messageListener', () => {
 
     // Replace the real postMessage with the mock
     cw.postMessage = postMessageMock;
-    cw.origin = '*';
 
     // Define the message to send and target Origin
     const message = {