diff --git a/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte b/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
index 800905202d..1331ce0bdb 100644
--- a/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
+++ b/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
@@ -1,21 +1,10 @@
 <script>
-  import { setContext, onMount } from "svelte"
-
   import { store } from "builderStore"
-  import {
-    LayoutIcon,
-    PaintIcon,
-    TerminalIcon,
-    CircleIndicator,
-    EventsIcon,
-  } from "components/common/Icons/"
   import panelStructure from "./temporaryPanelStructure.js"
   import CategoryTab from "./CategoryTab.svelte"
   import DesignView from "./DesignView.svelte"
   import SettingsView from "./SettingsView.svelte"
 
-  let current_view = "design"
-  let codeEditor
   let flattenedPanel = flattenComponents(panelStructure.categories)
   let categories = [
     { value: "settings", name: "Settings" },
@@ -23,7 +12,6 @@
   ]
   let selectedCategory = categories[0]
 
-  $: components = $store.components
   $: componentInstance =
     $store.currentView !== "component"
       ? { ...$store.currentPreviewItem, ...$store.currentComponentInfo }
diff --git a/packages/builder/src/components/userInterface/ComponentSelectionList.svelte b/packages/builder/src/components/userInterface/ComponentSelectionList.svelte
index 99123252ef..00ce42cf61 100644
--- a/packages/builder/src/components/userInterface/ComponentSelectionList.svelte
+++ b/packages/builder/src/components/userInterface/ComponentSelectionList.svelte
@@ -1,33 +1,13 @@
 <script>
   import { goto } from "@sveltech/routify"
-  import { splitName } from "./pagesParsing/splitRootComponentName.js"
+  import { store } from "builderStore"
   import components from "./temporaryPanelStructure.js"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import CategoryTab from "./CategoryTab.svelte"
-  import {
-    find,
-    sortBy,
-    groupBy,
-    values,
-    filter,
-    map,
-    uniqBy,
-    flatten,
-  } from "lodash/fp"
-
-  import { pipe } from "components/common/core"
 
   import Tab from "./ItemTab/Tab.svelte"
-  import { store } from "builderStore"
 
   export let toggleTab
 
-  let selectTemplateDialog
-  let selectedTemplateInstance
-  let templateInstances = []
-
-  let selectedComponent = null
-
   const categories = components.categories
   let selectedCategory = categories[0]
 
diff --git a/packages/builder/src/components/userInterface/ItemTab/Tab.svelte b/packages/builder/src/components/userInterface/ItemTab/Tab.svelte
index 70b00f394a..090fad1dc1 100644
--- a/packages/builder/src/components/userInterface/ItemTab/Tab.svelte
+++ b/packages/builder/src/components/userInterface/ItemTab/Tab.svelte
@@ -1,8 +1,10 @@
 <script>
   import { createEventDispatcher } from "svelte"
+  import { store } from "builderStore"
+  import Item from "./Item.svelte"
+
   const dispatch = createEventDispatcher()
 
-  import Item from "./Item.svelte"
   export let list
 
   let category = list
@@ -21,10 +23,12 @@
 </script>
 
 {#if !list.isCategory}
-  <button class="back-button" on:click={() => (list = category)}>Back</button>
+  <button class="back-button" on:click={goBack}>Back</button>
 {/if}
 {#each list.children as item}
-  <Item {item} on:click={() => handleClick(item)} />
+  {#if !item.showOnPages || item.showOnPages.includes($store.currentPageName)}
+    <Item {item} on:click={() => handleClick(item)} />
+  {/if}
 {/each}
 
 <style>
diff --git a/packages/builder/src/components/userInterface/temporaryPanelStructure.js b/packages/builder/src/components/userInterface/temporaryPanelStructure.js
index 36a6c8e073..287115b795 100644
--- a/packages/builder/src/components/userInterface/temporaryPanelStructure.js
+++ b/packages/builder/src/components/userInterface/temporaryPanelStructure.js
@@ -1198,39 +1198,40 @@ export default {
             ],
           },
         },
-        // {
-        //   name: "Login",
-        //   _component: "@budibase/standard-components/login",
-        //   description:
-        //     "A component that automatically generates a login screen for your app.",
-        //   icon: "ri-login-box-line",
-        //   children: [],
-        //   properties: {
-        //     design: { ...all },
-        //     settings: [
-        //       {
-        //         label: "Name",
-        //         key: "name",
-        //         control: Input,
-        //       },
-        //       {
-        //         label: "Logo",
-        //         key: "logo",
-        //         control: Input,
-        //       },
-        //       {
-        //         label: "Title",
-        //         key: "title",
-        //         control: Input,
-        //       },
-        //       {
-        //         label: "Button Text",
-        //         key: "buttonText",
-        //         control: Input,
-        //       },
-        //     ],
-        //   },
-        // },
+        {
+          name: "Login",
+          _component: "@budibase/standard-components/login",
+          description:
+            "A component that automatically generates a login screen for your app.",
+          icon: "ri-login-box-line",
+          children: [],
+          showOnPages: ["unauthenticated"],
+          properties: {
+            design: { ...all },
+            settings: [
+              {
+                label: "Name",
+                key: "name",
+                control: Input,
+              },
+              {
+                label: "Logo",
+                key: "logo",
+                control: Input,
+              },
+              {
+                label: "Title",
+                key: "title",
+                control: Input,
+              },
+              {
+                label: "Button Text",
+                key: "buttonText",
+                control: Input,
+              },
+            ],
+          },
+        },
       ],
     },
   ],
diff --git a/packages/server/src/middleware/authenticated.js b/packages/server/src/middleware/authenticated.js
index 3a2c2ec9a9..53ee65aa08 100644
--- a/packages/server/src/middleware/authenticated.js
+++ b/packages/server/src/middleware/authenticated.js
@@ -31,8 +31,12 @@ module.exports = async (ctx, next) => {
 
   if (!token) {
     ctx.auth.authenticated = false
+
+    const appId = process.env.CLOUD ? ctx.subdomains[1] : ctx.params.appId
+
     ctx.user = {
-      appId: process.env.CLOUD ? ctx.subdomains[1] : ctx.params.appId,
+      // if appId can't be determined from path param or subdomain
+      appId: appId || ctx.referer.split("/").pop(),
     }
     await next()
     return
diff --git a/packages/server/src/middleware/authorized.js b/packages/server/src/middleware/authorized.js
index 238b2cab3d..46f68c1564 100644
--- a/packages/server/src/middleware/authorized.js
+++ b/packages/server/src/middleware/authorized.js
@@ -34,6 +34,9 @@ module.exports = (permName, getItemId) => async (ctx, next) => {
     ctx.throw(403, "API key invalid")
   }
 
+  // don't expose builder endpoints in the cloud
+  if (environment.CLOUD && permName === BUILDER) return
+
   if (!ctx.auth.authenticated) {
     ctx.throw(403, "Session not authenticated")
   }
diff --git a/packages/standard-components/src/DataGrid/AttachmentCell/Button.svelte b/packages/standard-components/src/DataGrid/AttachmentCell/Button.svelte
index f2fc24fd92..b32e8e0294 100644
--- a/packages/standard-components/src/DataGrid/AttachmentCell/Button.svelte
+++ b/packages/standard-components/src/DataGrid/AttachmentCell/Button.svelte
@@ -27,4 +27,4 @@
         on:newRow={() => dispatch('newRow')} />
  </DropdownMenu> -->
 
-<!--<style ✂prettier:content✂="CiAgZGl2IHsKICAgIGRpc3BsYXk6IGdyaWQ7CiAgICBncmlkLXRlbXBsYXRlLWNvbHVtbnM6IGF1dG8gYXV0bzsKICAgIHBsYWNlLWl0ZW1zOiBzdGFydCBjZW50ZXI7CiAgfQogIGg1IHsKICAgIHBhZGRpbmc6IHZhcigtLXNwYWNpbmcteGwpIDAgMCB2YXIoLS1zcGFjaW5nLXhsKTsKICAgIG1hcmdpbjogMDsKICAgIGZvbnQtd2VpZ2h0OiA1MDA7CiAgfQo=" ✂prettier:content✂="" ✂prettier:content✂=""></style>-->
+<!--<style ✂prettier:content✂="CiAgZGl2IHsKICAgIGRpc3BsYXk6IGdyaWQ7CiAgICBncmlkLXRlbXBsYXRlLWNvbHVtbnM6IGF1dG8gYXV0bzsKICAgIHBsYWNlLWl0ZW1zOiBzdGFydCBjZW50ZXI7CiAgfQogIGg1IHsKICAgIHBhZGRpbmc6IHZhcigtLXNwYWNpbmcteGwpIDAgMCB2YXIoLS1zcGFjaW5nLXhsKTsKICAgIG1hcmdpbjogMDsKICAgIGZvbnQtd2VpZ2h0OiA1MDA7CiAgfQo=" ✂prettier:content✂="" ✂prettier:content✂="" ✂prettier:content✂="" ✂prettier:content✂=""></style>-->