diff --git a/packages/builder/src/builderStore/api.js b/packages/builder/src/builderStore/api.js
index a33a695028..46304e1486 100644
--- a/packages/builder/src/builderStore/api.js
+++ b/packages/builder/src/builderStore/api.js
@@ -1,15 +1,17 @@
+import { store } from "./index"
+import { get as svelteGet } from "svelte/store"
+
 const apiCall = method => async (
   url,
   body,
   headers = { "Content-Type": "application/json" }
 ) => {
-  const response = await fetch(url, {
+  headers["x-budibase-app-id"] = svelteGet(store).appId
+  return await fetch(url, {
     method: method,
     body: body && JSON.stringify(body),
     headers,
   })
-
-  return response
 }
 
 export const post = apiCall("POST")
diff --git a/packages/builder/src/pages/[application]/_reset.svelte b/packages/builder/src/pages/[application]/_reset.svelte
index 06942e03c8..2dd672586f 100644
--- a/packages/builder/src/pages/[application]/_reset.svelte
+++ b/packages/builder/src/pages/[application]/_reset.svelte
@@ -84,8 +84,6 @@
       <Button
         secondary
         on:click={() => {
-          // reset cookies for this app
-          document.cookie = `budibase:${application}:local=; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT;`
           window.open(`/${application}`)
         }}>
         Preview
diff --git a/packages/client/src/api/index.js b/packages/client/src/api/index.js
index 7d7c9b52c0..39139197a3 100644
--- a/packages/client/src/api/index.js
+++ b/packages/client/src/api/index.js
@@ -1,11 +1,12 @@
-import { authenticate } from "./authenticate"
-// import appStore from "../state/store"
+import {authenticate} from "./authenticate"
+import {getAppIdFromPath} from "../render/getAppId";
 
 const apiCall = method => async ({ url, body }) => {
   const response = await fetch(url, {
     method: method,
     headers: {
       "Content-Type": "application/json",
+      "x-budibase-app-id": getAppIdFromPath(),
     },
     body: body && JSON.stringify(body),
     credentials: "same-origin",
@@ -36,9 +37,8 @@ const del = apiCall("DELETE")
 
 const ERROR_MEMBER = "##error"
 const error = message => {
-  const err = { [ERROR_MEMBER]: message }
   // appStore.update(s => s["##error_message"], message)
-  return err
+  return {[ERROR_MEMBER]: message}
 }
 
 const isSuccess = obj => !obj || !obj[ERROR_MEMBER]
@@ -81,6 +81,9 @@ const makeRowRequestBody = (parameters, state) => {
 
   // then override with supplied parameters
   for (let fieldName in parameters.fields) {
+    if (!parameters.fields.hasOwnProperty(fieldName)) {
+      continue
+    }
     const field = parameters.fields[fieldName]
 
     // ensure fields sent are of the correct type
diff --git a/packages/server/src/api/controllers/auth.js b/packages/server/src/api/controllers/auth.js
index 2c7e43d2cc..b7a084480a 100644
--- a/packages/server/src/api/controllers/auth.js
+++ b/packages/server/src/api/controllers/auth.js
@@ -4,10 +4,10 @@ const bcrypt = require("../../utilities/bcrypt")
 const env = require("../../environment")
 const { getAPIKey } = require("../../utilities/usageQuota")
 const { generateUserID } = require("../../db/utils")
-const { getCookieName } = require("../../utilities")
+const { setCookie } = require("../../utilities")
 
 exports.authenticate = async ctx => {
-  const appId = ctx.user.appId
+  const appId = ctx.appId
   if (!appId) ctx.throw(400, "No appId")
 
   const { username, password } = ctx.request.body
@@ -46,15 +46,7 @@ exports.authenticate = async ctx => {
       expiresIn: "1 day",
     })
 
-    const expires = new Date()
-    expires.setDate(expires.getDate() + 1)
-
-    ctx.cookies.set(getCookieName(appId), token, {
-      expires,
-      path: "/",
-      httpOnly: false,
-      overwrite: true,
-    })
+    setCookie(ctx, appId, token)
 
     delete dbUser.password
     ctx.body = {
diff --git a/packages/server/src/middleware/authenticated.js b/packages/server/src/middleware/authenticated.js
index a4bd347b75..5bdafa9dee 100644
--- a/packages/server/src/middleware/authenticated.js
+++ b/packages/server/src/middleware/authenticated.js
@@ -9,7 +9,7 @@ const {
 } = require("../utilities/accessLevels")
 const env = require("../environment")
 const { AuthTypes } = require("../constants")
-const { getAppId, getCookieName } = require("../utilities")
+const { getAppId, getCookieName, setCookie } = require("../utilities")
 
 module.exports = async (ctx, next) => {
   if (ctx.path === "/_builder") {
@@ -17,7 +17,14 @@ module.exports = async (ctx, next) => {
     return
   }
 
-  const appId = getAppId(ctx)
+  // do everything we can to make sure the appId is held correctly
+  // we hold it in state as a
+  let appId = getAppId(ctx)
+  if (appId) {
+    setCookie(ctx, "currentapp", appId)
+  } else {
+    appId = ctx.cookies.get(getCookieName("currentapp"))
+  }
 
   const appToken = ctx.cookies.get(getCookieName(appId))
   const builderToken = ctx.cookies.get(getCookieName())
@@ -43,14 +50,12 @@ module.exports = async (ctx, next) => {
 
   try {
     const jwtPayload = jwt.verify(token, ctx.config.jwtSecret)
+    ctx.appId = appId
     ctx.auth.apiKey = jwtPayload.apiKey
     ctx.user = {
       ...jwtPayload,
-      appId: jwtPayload.appId,
-      accessLevel: await getAccessLevel(
-        jwtPayload.appId,
-        jwtPayload.accessLevelId
-      ),
+      appId: appId,
+      accessLevel: await getAccessLevel(appId, jwtPayload.accessLevelId),
     }
   } catch (err) {
     ctx.throw(err.status || STATUS_CODES.FORBIDDEN, err.text)
diff --git a/packages/server/src/utilities/builder/setBuilderToken.js b/packages/server/src/utilities/builder/setBuilderToken.js
index f77bfe49a4..38de0df939 100644
--- a/packages/server/src/utilities/builder/setBuilderToken.js
+++ b/packages/server/src/utilities/builder/setBuilderToken.js
@@ -3,7 +3,7 @@ const env = require("../../environment")
 const CouchDB = require("../../db")
 const jwt = require("jsonwebtoken")
 const { DocumentTypes, SEPARATOR } = require("../../db/utils")
-const { getCookieName } = require("../index")
+const { setCookie } = require("../index")
 const APP_PREFIX = DocumentTypes.APP + SEPARATOR
 
 module.exports = async (ctx, appId, version) => {
@@ -20,21 +20,13 @@ module.exports = async (ctx, appId, version) => {
     expiresIn: "30 days",
   })
 
-  const expiry = new Date()
-  expiry.setDate(expiry.getDate() + 30)
   // set the builder token
-  ctx.cookies.set(getCookieName(), token, {
-    expires: expiry,
-    httpOnly: false,
-    overwrite: true,
-  })
+  setCookie(ctx, "builder", token)
   // need to clear all app tokens or else unable to use the app in the builder
   let allDbNames = await CouchDB.allDbs()
   allDbNames.map(dbName => {
     if (dbName.startsWith(APP_PREFIX)) {
-      ctx.cookies.set(getCookieName(dbName), "", {
-        overwrite: true,
-      })
+      setCookie(ctx, dbName, "")
     }
   })
 }
diff --git a/packages/server/src/utilities/index.js b/packages/server/src/utilities/index.js
index 47db3f7ec1..73e11be1c9 100644
--- a/packages/server/src/utilities/index.js
+++ b/packages/server/src/utilities/index.js
@@ -1,4 +1,7 @@
 const env = require("../environment")
+const { DocumentTypes, SEPARATOR } = require("../db/utils")
+
+const APP_PREFIX = DocumentTypes.APP + SEPARATOR
 
 exports.wait = ms => new Promise(resolve => setTimeout(resolve, ms))
 
@@ -17,26 +20,47 @@ exports.isDev = () => {
  * @returns {string|undefined} If an appId was found it will be returned.
  */
 exports.getAppId = ctx => {
-  let appId = env.CLOUD ? ctx.subdomains[1] : ctx.params.appId
+  let appId = ctx.headers["x-budibase-app-id"]
+  if (!appId) {
+    appId = env.CLOUD ? ctx.subdomains[1] : ctx.params.appId
+  }
   // look in body if can't find it in subdomain
   if (!appId && ctx.request.body && ctx.request.body.appId) {
     appId = ctx.request.body.appId
   }
-  // if appId can't be determined from path param or subdomain
-  if (!appId && ctx.request.headers.referer) {
-    const url = new URL(ctx.request.headers.referer)
-    // remove leading and trailing slashes from appId
-    appId = url.pathname.replace(/\//g, "")
+  let appPath =
+    ctx.request.headers.referrer ||
+    ctx.path.split("/").filter(subPath => subPath.startsWith(APP_PREFIX))
+  if (!appId && appPath.length !== 0) {
+    appId = appPath[0]
   }
   return appId
 }
 
 /**
  * Get the name of the cookie which is to be updated/retrieved
- * @param {string|undefined|null} appId OPTIONAL can specify the specific app if previewing etc
+ * @param {string|undefined|null} name OPTIONAL can specify the specific app if previewing etc
  * @returns {string} The name of the token trying to find
  */
-exports.getCookieName = (appId = null) => {
+exports.getCookieName = (name = "builder") => {
   let environment = env.CLOUD ? "cloud" : "local"
-  return `budibase:${appId ? appId : "builder"}:${environment}`
+  return `budibase:${name}:${environment}`
+}
+
+/**
+ * Store a cookie for the request, has a hardcoded expiry.
+ * @param {object} ctx The request which is to be manipulated.
+ * @param {string} name The name of the cookie to set.
+ * @param {string|object} value The value of cookie which will be set.
+ */
+exports.setCookie = (ctx, name, value) => {
+  const expires = new Date()
+  expires.setDate(expires.getDate() + 1)
+
+  ctx.cookies.set(exports.getCookieName(name), value, {
+    expires,
+    path: "/",
+    httpOnly: false,
+    overwrite: true,
+  })
 }
diff --git a/packages/standard-components/src/api.js b/packages/standard-components/src/api.js
index 45e7a8f134..7d9be3db56 100644
--- a/packages/standard-components/src/api.js
+++ b/packages/standard-components/src/api.js
@@ -5,6 +5,10 @@ const apiCall = method => async (
     "Content-Type": "application/json",
   }
 ) => {
+  const appId = location.pathname.split("/")[1]
+  if (appId) {
+    headers["x-budibase-app-id"] = appId
+  }
   const response = await fetch(url, {
     method: method,
     body: body && JSON.stringify(body),