diff --git a/pages/Login/jsobjects/Bff1/metadata.json b/pages/Login/jsobjects/Bff1/metadata.json
new file mode 100644
index 0000000..f393fb6
--- /dev/null
+++ b/pages/Login/jsobjects/Bff1/metadata.json
@@ -0,0 +1,14 @@
+{
+  "gitSyncId": "6a61c812eeb7b478efb4d1fa_d1b2d150-285b-4b7f-8661-9c4b4234c4a5",
+  "id": "Login__$Bff1$_Bff",
+  "isPublic": true,
+  "moduleInstanceId": "Login_Bff1",
+  "rootModuleInstanceId": "Login_Bff1",
+  "unpublishedCollection": {
+    "contextType": "PAGE",
+    "name": "_$Bff1$_Bff",
+    "pageId": "Login",
+    "pluginId": "js-plugin",
+    "pluginType": "JS"
+  }
+}
\ No newline at end of file
diff --git a/pages/Login/module instances/Bff1.json b/pages/Login/module instances/Bff1.json
new file mode 100644
index 0000000..e8cedad
--- /dev/null
+++ b/pages/Login/module instances/Bff1.json	
@@ -0,0 +1,64 @@
+{
+  "gitSyncId": "6a61c812eeb7b478efb4d1fa_f22bea60-7312-4e33-9dcb-3783aba64280",
+  "id": "Login_Bff1",
+  "moduleUUID": "b0d6dbe1-9ee5-486f-9f93-4baa17986ccf",
+  "packageUUID": "35174735-e12c-426f-9f2f-fe12a068c3ba",
+  "type": "JS_MODULE",
+  "unpublishedModuleInstance": {
+    "contextType": "PAGE",
+    "inputs": {
+      "checkReturningFromLogin": "[\"Start\"]",
+      "clearSession": "[]",
+      "guardPage": "[\"\"]",
+      "isLoggedIn": "[]",
+      "login": "[\"app-hub\"]",
+      "logout": "[]"
+    },
+    "moduleInputs": {
+      "fkpwwxqbyo": {
+        "controlType": "INPUT_TEXT",
+        "defaultValue": "[]",
+        "id": "fkpwwxqbyo",
+        "label": "clearSession",
+        "propertyName": "inputs.clearSession"
+      },
+      "igfxnkxgzx": {
+        "controlType": "INPUT_TEXT",
+        "defaultValue": "[]",
+        "id": "igfxnkxgzx",
+        "label": "isLoggedIn",
+        "propertyName": "inputs.isLoggedIn"
+      },
+      "narkupnajw": {
+        "controlType": "INPUT_TEXT",
+        "defaultValue": "[]",
+        "id": "narkupnajw",
+        "label": "guardPage",
+        "propertyName": "inputs.guardPage"
+      },
+      "qqzhfbnjmf": {
+        "controlType": "INPUT_TEXT",
+        "defaultValue": "[]",
+        "id": "qqzhfbnjmf",
+        "label": "checkReturningFromLogin",
+        "propertyName": "inputs.checkReturningFromLogin"
+      },
+      "tlfzzixvrw": {
+        "controlType": "INPUT_TEXT",
+        "defaultValue": "[]",
+        "id": "tlfzzixvrw",
+        "label": "login",
+        "propertyName": "inputs.login"
+      },
+      "yjtnrwqqzm": {
+        "controlType": "INPUT_TEXT",
+        "defaultValue": "[]",
+        "id": "yjtnrwqqzm",
+        "label": "logout",
+        "propertyName": "inputs.logout"
+      }
+    },
+    "name": "Bff1",
+    "pageId": "Login"
+  }
+}
\ No newline at end of file
diff --git a/pages/Login/queries/Bff1-checkReturningFromLogin/metadata.json b/pages/Login/queries/Bff1-checkReturningFromLogin/metadata.json
new file mode 100644
index 0000000..c1436a8
--- /dev/null
+++ b/pages/Login/queries/Bff1-checkReturningFromLogin/metadata.json
@@ -0,0 +1,24 @@
+{
+  "gitSyncId": "6a61c812eeb7b478efb4d1fa_d6e91ded-943a-479d-9b24-6b5da6705649",
+  "id": "Login__$Bff1$_Bff.checkReturningFromLogin",
+  "isPublic": true,
+  "moduleInstanceId": "Login_Bff1",
+  "pluginId": "js-plugin",
+  "pluginType": "JS",
+  "rootModuleInstanceId": "Login_Bff1",
+  "unpublishedAction": {
+    "collectionId": "Login__$Bff1$_Bff",
+    "confirmBeforeExecute": false,
+    "contextType": "PAGE",
+    "datasource": {
+      "isAutoGenerated": false,
+      "name": "UNUSED_DATASOURCE",
+      "pluginId": "js-plugin"
+    },
+    "fullyQualifiedName": "_$Bff1$_Bff.checkReturningFromLogin",
+    "name": "checkReturningFromLogin",
+    "pageId": "Login",
+    "runBehaviour": "ON_PAGE_LOAD",
+    "userSetOnLoad": true
+  }
+}
\ No newline at end of file
diff --git a/pages/Login/queries/Bff1-clearSession/metadata.json b/pages/Login/queries/Bff1-clearSession/metadata.json
new file mode 100644
index 0000000..a9e9bd9
--- /dev/null
+++ b/pages/Login/queries/Bff1-clearSession/metadata.json
@@ -0,0 +1,24 @@
+{
+  "gitSyncId": "6a61c812eeb7b478efb4d1fa_a44cc0c9-2a2d-4961-b674-73432164bad4",
+  "id": "Login__$Bff1$_Bff.clearSession",
+  "isPublic": true,
+  "moduleInstanceId": "Login_Bff1",
+  "pluginId": "js-plugin",
+  "pluginType": "JS",
+  "rootModuleInstanceId": "Login_Bff1",
+  "unpublishedAction": {
+    "collectionId": "Login__$Bff1$_Bff",
+    "confirmBeforeExecute": false,
+    "contextType": "PAGE",
+    "datasource": {
+      "isAutoGenerated": false,
+      "name": "UNUSED_DATASOURCE",
+      "pluginId": "js-plugin"
+    },
+    "fullyQualifiedName": "_$Bff1$_Bff.clearSession",
+    "name": "clearSession",
+    "pageId": "Login",
+    "runBehaviour": "MANUAL",
+    "userSetOnLoad": false
+  }
+}
\ No newline at end of file
diff --git a/pages/Login/queries/Bff1-guardPage/metadata.json b/pages/Login/queries/Bff1-guardPage/metadata.json
new file mode 100644
index 0000000..8cacb74
--- /dev/null
+++ b/pages/Login/queries/Bff1-guardPage/metadata.json
@@ -0,0 +1,24 @@
+{
+  "gitSyncId": "6a61c812eeb7b478efb4d1fa_213167f2-f78b-4309-9c33-e186e2b3c690",
+  "id": "Login__$Bff1$_Bff.guardPage",
+  "isPublic": true,
+  "moduleInstanceId": "Login_Bff1",
+  "pluginId": "js-plugin",
+  "pluginType": "JS",
+  "rootModuleInstanceId": "Login_Bff1",
+  "unpublishedAction": {
+    "collectionId": "Login__$Bff1$_Bff",
+    "confirmBeforeExecute": false,
+    "contextType": "PAGE",
+    "datasource": {
+      "isAutoGenerated": false,
+      "name": "UNUSED_DATASOURCE",
+      "pluginId": "js-plugin"
+    },
+    "fullyQualifiedName": "_$Bff1$_Bff.guardPage",
+    "name": "guardPage",
+    "pageId": "Login",
+    "runBehaviour": "MANUAL",
+    "userSetOnLoad": false
+  }
+}
\ No newline at end of file
diff --git a/pages/Login/queries/Bff1-isLoggedIn/metadata.json b/pages/Login/queries/Bff1-isLoggedIn/metadata.json
new file mode 100644
index 0000000..6a40332
--- /dev/null
+++ b/pages/Login/queries/Bff1-isLoggedIn/metadata.json
@@ -0,0 +1,24 @@
+{
+  "gitSyncId": "6a61c812eeb7b478efb4d1fa_9b59eece-a8a6-427f-8101-af2aa0e273f8",
+  "id": "Login__$Bff1$_Bff.isLoggedIn",
+  "isPublic": true,
+  "moduleInstanceId": "Login_Bff1",
+  "pluginId": "js-plugin",
+  "pluginType": "JS",
+  "rootModuleInstanceId": "Login_Bff1",
+  "unpublishedAction": {
+    "collectionId": "Login__$Bff1$_Bff",
+    "confirmBeforeExecute": false,
+    "contextType": "PAGE",
+    "datasource": {
+      "isAutoGenerated": false,
+      "name": "UNUSED_DATASOURCE",
+      "pluginId": "js-plugin"
+    },
+    "fullyQualifiedName": "_$Bff1$_Bff.isLoggedIn",
+    "name": "isLoggedIn",
+    "pageId": "Login",
+    "runBehaviour": "MANUAL",
+    "userSetOnLoad": false
+  }
+}
\ No newline at end of file
diff --git a/pages/Login/queries/Bff1-login/metadata.json b/pages/Login/queries/Bff1-login/metadata.json
new file mode 100644
index 0000000..6b5cc69
--- /dev/null
+++ b/pages/Login/queries/Bff1-login/metadata.json
@@ -0,0 +1,24 @@
+{
+  "gitSyncId": "6a61c812eeb7b478efb4d1fa_bd8ac71f-1dbc-4a70-987f-946f8814e85b",
+  "id": "Login__$Bff1$_Bff.login",
+  "isPublic": true,
+  "moduleInstanceId": "Login_Bff1",
+  "pluginId": "js-plugin",
+  "pluginType": "JS",
+  "rootModuleInstanceId": "Login_Bff1",
+  "unpublishedAction": {
+    "collectionId": "Login__$Bff1$_Bff",
+    "confirmBeforeExecute": false,
+    "contextType": "PAGE",
+    "datasource": {
+      "isAutoGenerated": false,
+      "name": "UNUSED_DATASOURCE",
+      "pluginId": "js-plugin"
+    },
+    "fullyQualifiedName": "_$Bff1$_Bff.login",
+    "name": "login",
+    "pageId": "Login",
+    "runBehaviour": "MANUAL",
+    "userSetOnLoad": false
+  }
+}
\ No newline at end of file
diff --git a/pages/Login/queries/Bff1-logout/metadata.json b/pages/Login/queries/Bff1-logout/metadata.json
new file mode 100644
index 0000000..ef7de96
--- /dev/null
+++ b/pages/Login/queries/Bff1-logout/metadata.json
@@ -0,0 +1,24 @@
+{
+  "gitSyncId": "6a61c812eeb7b478efb4d1fa_9e074a7c-2e5f-40e4-8366-254fe67a2362",
+  "id": "Login__$Bff1$_Bff.logout",
+  "isPublic": true,
+  "moduleInstanceId": "Login_Bff1",
+  "pluginId": "js-plugin",
+  "pluginType": "JS",
+  "rootModuleInstanceId": "Login_Bff1",
+  "unpublishedAction": {
+    "collectionId": "Login__$Bff1$_Bff",
+    "confirmBeforeExecute": false,
+    "contextType": "PAGE",
+    "datasource": {
+      "isAutoGenerated": false,
+      "name": "UNUSED_DATASOURCE",
+      "pluginId": "js-plugin"
+    },
+    "fullyQualifiedName": "_$Bff1$_Bff.logout",
+    "name": "logout",
+    "pageId": "Login",
+    "runBehaviour": "MANUAL",
+    "userSetOnLoad": false
+  }
+}
\ No newline at end of file
diff --git a/pages/Start/module instances/Bff.json b/pages/Start/module instances/Bff.json
index ea1d442..6578f48 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": "[\"\"]",
       "clearSession": "[]",
-      "guardPage": "[]",
+      "guardPage": "[\"Login\"]",
       "isLoggedIn": "[]",
-      "login": "[]",
+      "login": "[\"\"]",
       "logout": "[]"
     },
     "moduleInputs": {
diff --git a/pages/Start/queries/Bff-guardPage/metadata.json b/pages/Start/queries/Bff-guardPage/metadata.json
index 535646b..263b9fc 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