diff --git a/pages/Login/module instances/Bff.json b/pages/Login/module instances/Bff.json
index a7308fc..67c2734 100644
--- a/pages/Login/module instances/Bff.json	
+++ b/pages/Login/module instances/Bff.json	
@@ -7,11 +7,11 @@
   "unpublishedModuleInstance": {
     "contextType": "PAGE",
     "inputs": {
-      "checkReturningFromLogin": "[]",
+      "checkReturningFromLogin": "[\"Start\"]",
       "clearSession": "[]",
-      "guardPage": "[]",
+      "guardPage": "[\"Login\"]",
       "isLoggedIn": "[]",
-      "login": "[]",
+      "login": "[\"app-hub\"]",
       "logout": "[]"
     },
     "moduleInputs": {
diff --git a/pages/Login/queries/Bff-checkReturningFromLogin/metadata.json b/pages/Login/queries/Bff-checkReturningFromLogin/metadata.json
index 6050676..6f47e90 100644
--- a/pages/Login/queries/Bff-checkReturningFromLogin/metadata.json
+++ b/pages/Login/queries/Bff-checkReturningFromLogin/metadata.json
@@ -18,7 +18,7 @@
     "fullyQualifiedName": "_$Bff$_Bff.checkReturningFromLogin",
     "name": "checkReturningFromLogin",
     "pageId": "Login",
-    "runBehaviour": "MANUAL",
-    "userSetOnLoad": false
+    "runBehaviour": "ON_PAGE_LOAD",
+    "userSetOnLoad": true
   }
 }
\ No newline at end of file
diff --git a/pages/Login/queries/Bff-login/metadata.json b/pages/Login/queries/Bff-login/metadata.json
index 18dbdad..be9f2b7 100644
--- a/pages/Login/queries/Bff-login/metadata.json
+++ b/pages/Login/queries/Bff-login/metadata.json
@@ -18,7 +18,7 @@
     "fullyQualifiedName": "_$Bff$_Bff.login",
     "name": "login",
     "pageId": "Login",
-    "runBehaviour": "MANUAL",
-    "userSetOnLoad": false
+    "runBehaviour": "ON_PAGE_LOAD",
+    "userSetOnLoad": true
   }
 }
\ No newline at end of file
diff --git a/pages/Start/module instances/Bff.json b/pages/Start/module instances/Bff.json
index dff2389..37e5395 100644
--- a/pages/Start/module instances/Bff.json	
+++ b/pages/Start/module instances/Bff.json	
@@ -7,11 +7,11 @@
   "unpublishedModuleInstance": {
     "contextType": "PAGE",
     "inputs": {
-      "checkReturningFromLogin": "[]",
+      "checkReturningFromLogin": "[\"Start\"]",
       "clearSession": "[]",
-      "guardPage": "[]",
+      "guardPage": "[\"Login\"]",
       "isLoggedIn": "[]",
-      "login": "[]",
+      "login": "[\"app-hub\"]",
       "logout": "[]"
     },
     "moduleInputs": {
diff --git a/pages/Start/queries/Bff-guardPage/metadata.json b/pages/Start/queries/Bff-guardPage/metadata.json
index cce39a7..67ff439 100644
--- a/pages/Start/queries/Bff-guardPage/metadata.json
+++ b/pages/Start/queries/Bff-guardPage/metadata.json
@@ -18,7 +18,7 @@
     "fullyQualifiedName": "_$Bff$_Bff.guardPage",
     "name": "guardPage",
     "pageId": "Start",
-    "runBehaviour": "MANUAL",
-    "userSetOnLoad": false
+    "runBehaviour": "ON_PAGE_LOAD",
+    "userSetOnLoad": true
   }
 }
\ No newline at end of file