diff --git a/packages/builder/src/components/deploy/RevertModal.svelte b/packages/builder/src/components/deploy/RevertModal.svelte
index 7f4decebee..bc2ad0d0aa 100644
--- a/packages/builder/src/components/deploy/RevertModal.svelte
+++ b/packages/builder/src/components/deploy/RevertModal.svelte
@@ -1,9 +1,16 @@
 <script>
-  import { Icon, Modal, notifications, ModalContent } from "@budibase/bbui"
+  import {
+    Icon,
+    Input,
+    Modal,
+    notifications,
+    ModalContent,
+  } from "@budibase/bbui"
   import { store } from "builderStore"
   import api from "builderStore/api"
 
   let revertModal
+  let appName
 
   $: appId = $store.appId
 
@@ -33,10 +40,17 @@
 
 <Icon name="Revert" hoverable on:click={revertModal.show} />
 <Modal bind:this={revertModal}>
-  <ModalContent title="Revert Changes" confirmText="Revert" onConfirm={revert}>
+  <ModalContent
+    title="Revert Changes"
+    confirmText="Revert"
+    onConfirm={revert}
+    disabled={appName !== $store.name}
+  >
     <span
       >The changes you have made will be deleted and the application reverted
       back to its production state.</span
     >
+    <span>Please enter your app name to continue.</span>
+    <Input bind:value={appName} />
   </ModalContent>
 </Modal>
diff --git a/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte b/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte
index ac5e7ef48d..a97cf22442 100644
--- a/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte
+++ b/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte
@@ -69,6 +69,7 @@
     theme: $store.theme,
     customTheme: $store.customTheme,
     previewDevice: $store.previewDevice,
+    messagePassing: $store.clientFeatures.messagePassing
   }
 
   // Saving pages and screens to the DB causes them to have _revs.
diff --git a/packages/builder/src/components/design/AppPreview/iframeTemplate.js b/packages/builder/src/components/design/AppPreview/iframeTemplate.js
index 89fa63012d..8bc14f42b9 100644
--- a/packages/builder/src/components/design/AppPreview/iframeTemplate.js
+++ b/packages/builder/src/components/design/AppPreview/iframeTemplate.js
@@ -65,6 +65,7 @@ export default `
           theme,
           customTheme,
           previewDevice,
+          messagePassing
         } = parsed
 
         // Set some flags so the app knows we're in the builder
@@ -89,7 +90,11 @@ export default `
             throw "The client library couldn't be loaded"
           }
         } catch (error) {
-          window.parent.postMessage({ type: "error", error })
+          if (messagePassing) {
+            window.parent.postMessage({ type: "error", error })
+          } else {
+            window.dispatchEvent(new CustomEvent("error", { detail: error }))
+          }
         }
       }
 
@@ -97,7 +102,9 @@ export default `
       window.addEventListener("keydown", evt => {
         window.parent.postMessage({ type: "keydown", key: event.key })
       })
+
       window.parent.postMessage({ type: "ready" })
+      window.dispatchEvent(new Event("ready"))
     </script>
   </head>
   <body/>
diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte
index 1db5e46261..68845e075b 100644
--- a/packages/builder/src/components/start/CreateAppModal.svelte
+++ b/packages/builder/src/components/start/CreateAppModal.svelte
@@ -157,6 +157,11 @@
     }
     return title
   }
+
+  async function onCancel() {
+    template = null
+    await auth.setInitInfo({})
+  }
 </script>
 
 {#if showTemplateSelection}
@@ -186,7 +191,7 @@
     title={getModalTitle()}
     confirmText={template?.fromFile ? "Import app" : "Create app"}
     onConfirm={createNewApp}
-    onCancel={inline ? () => (template = null) : null}
+    onCancel={inline ? onCancel : null}
     cancelText={inline ? "Back" : undefined}
     showCloseIcon={!inline}
     disabled={!valid}
diff --git a/packages/builder/src/stores/portal/auth.js b/packages/builder/src/stores/portal/auth.js
index bd08611fc9..9a12667a7e 100644
--- a/packages/builder/src/stores/portal/auth.js
+++ b/packages/builder/src/stores/portal/auth.js
@@ -80,6 +80,10 @@ export function createAuthStore() {
     }
   }
 
+  async function setInitInfo(info) {
+    await api.post(`/api/global/auth/init`, info)
+  }
+
   return {
     subscribe: store.subscribe,
     setOrganisation: setOrganisation,
@@ -87,9 +91,7 @@ export function createAuthStore() {
       const response = await api.get(`/api/global/auth/init`)
       return await response.json()
     },
-    setInitInfo: async info => {
-      await api.post(`/api/global/auth/init`, info)
-    },
+    setInitInfo,
     checkQueryString: async () => {
       const urlParams = new URLSearchParams(window.location.search)
       if (urlParams.has("tenantId")) {
@@ -129,6 +131,7 @@ export function createAuthStore() {
         throw "Unable to create logout"
       }
       await response.json()
+      await setInitInfo({})
       setUser(null)
     },
     updateSelf: async fields => {
diff --git a/packages/server/src/api/controllers/application.js b/packages/server/src/api/controllers/application.js
index f27efff29e..4ea308a790 100644
--- a/packages/server/src/api/controllers/application.js
+++ b/packages/server/src/api/controllers/application.js
@@ -323,7 +323,7 @@ exports.delete = async ctx => {
   ctx.body = result
 }
 
-exports.sync = async ctx => {
+exports.sync = async (ctx, next) => {
   const appId = ctx.params.appId
   if (!isDevAppID(appId)) {
     ctx.throw(400, "This action cannot be performed for production apps")
@@ -336,10 +336,11 @@ exports.sync = async ctx => {
     if (info.error) throw info.error
   } catch (err) {
     // the database doesn't exist. Don't replicate
+    ctx.status = 200
     ctx.body = {
       message: "App sync not required, app not deployed.",
     }
-    return
+    return next()
   }
 
   const replication = new Replication({