diff --git a/lerna.json b/lerna.json
index 202e1c6f49..48af3c36b2 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.6.8",
+  "version": "2.6.10",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": ["packages/*"],
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 03dae9feca..9cfc572101 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.6.8",
+  "version": "2.6.10",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "^2.6.8",
+    "@budibase/types": "^2.6.10",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index f0fe559705..60bf76f61a 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.6.8",
+  "version": "2.6.10",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,8 +38,8 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/shared-core": "^2.6.8",
-    "@budibase/string-templates": "^2.6.8",
+    "@budibase/shared-core": "^2.6.10",
+    "@budibase/string-templates": "^2.6.10",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 1b69c7aaac..d015fb61a5 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.6.8",
+  "version": "2.6.10",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.6.8",
-    "@budibase/frontend-core": "^2.6.8",
-    "@budibase/shared-core": "^2.6.8",
-    "@budibase/string-templates": "^2.6.8",
+    "@budibase/bbui": "^2.6.10",
+    "@budibase/frontend-core": "^2.6.10",
+    "@budibase/shared-core": "^2.6.10",
+    "@budibase/string-templates": "^2.6.10",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
index 8e018ae907..546f5f57ba 100644
--- a/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
@@ -107,8 +107,9 @@
     useSampleData,
     isGoogle,
   }) => {
+    let app
     try {
-      const app = await createApp(useSampleData)
+      app = await createApp(useSampleData)
 
       let datasource
       if (datasourceConfig) {
@@ -134,6 +135,17 @@
       console.log(e)
       creationLoading = false
       notifications.error("There was a problem creating your app")
+
+      // Reset the store so that we don't send up stale headers
+      store.actions.reset()
+
+      // If we successfully created an app, delete it again so that we
+      // can try again once the error has been corrected.
+      // This also ensures onboarding can't be skipped by entering invalid
+      // data credentials.
+      if (app?.appId) {
+        await API.deleteApp(app.appId)
+      }
     }
   }
 </script>
@@ -146,80 +158,87 @@
   />
 </Modal>
 
-<SplitPage>
-  {#if stage === "name"}
-    <NamePanel bind:name bind:url onNext={() => (stage = "data")} />
-  {:else if googleComplete}
-    <div class="centered">
-      <Body
-        >Please login to your Google account in the new tab which as opened to
-        continue.</Body
-      >
-    </div>
-  {:else if integrationsLoading || creationLoading}
-    <div class="centered">
-      <Spinner />
-    </div>
-  {:else if stage === "data"}
-    <DataPanel onBack={() => (stage = "name")}>
-      <div class="dataButton">
-        <FancyButton on:click={() => handleCreateApp({ useSampleData: true })}>
-          <div class="dataButtonContent">
-            <div class="dataButtonIcon">
-              <img
-                alt="Budibase Logo"
-                class="budibaseLogo"
-                src={"https://i.imgur.com/Xhdt1YP.png"}
-              />
-            </div>
-            Budibase Sample data
-          </div>
-        </FancyButton>
+<div class="full-width">
+  <SplitPage>
+    {#if stage === "name"}
+      <NamePanel bind:name bind:url onNext={() => (stage = "data")} />
+    {:else if googleComplete}
+      <div class="centered">
+        <Body
+          >Please login to your Google account in the new tab which as opened to
+          continue.</Body
+        >
       </div>
-      <div class="dataButton">
-        <FancyButton on:click={uploadModal.show}>
-          <div class="dataButtonContent">
-            <div class="dataButtonIcon">
-              <FontAwesomeIcon name="fa-solid fa-file-arrow-up" />
-            </div>
-            Upload data (CSV or JSON)
-          </div>
-        </FancyButton>
+    {:else if integrationsLoading || creationLoading}
+      <div class="centered">
+        <Spinner />
       </div>
-      {#each Object.entries(plusIntegrations) as [integrationType, schema]}
+    {:else if stage === "data"}
+      <DataPanel onBack={() => (stage = "name")}>
         <div class="dataButton">
-          <FancyButton on:click={() => (stage = integrationType)}>
+          <FancyButton
+            on:click={() => handleCreateApp({ useSampleData: true })}
+          >
             <div class="dataButtonContent">
               <div class="dataButtonIcon">
-                <IntegrationIcon {integrationType} {schema} />
+                <img
+                  alt="Budibase Logo"
+                  class="budibaseLogo"
+                  src={"https://i.imgur.com/Xhdt1YP.png"}
+                />
               </div>
-              {schema.friendlyName}
+              Budibase Sample data
             </div>
           </FancyButton>
         </div>
-      {/each}
-    </DataPanel>
-  {:else if stage in plusIntegrations}
-    <DatasourceConfigPanel
-      title={plusIntegrations[stage].friendlyName}
-      fields={plusIntegrations[stage].datasource}
-      type={stage}
-      onBack={() => (stage = "data")}
-      onNext={data => {
-        const isGoogle = data.isGoogle
-        delete data.isGoogle
-        return handleCreateApp({ datasourceConfig: data, isGoogle })
-      }}
-    />
-  {:else}
-    <p>There was an problem. Please refresh the page and try again.</p>
-  {/if}
-  <div slot="right">
-    <ExampleApp {name} showData={stage !== "name"} />
-  </div>
-</SplitPage>
+        <div class="dataButton">
+          <FancyButton on:click={uploadModal.show}>
+            <div class="dataButtonContent">
+              <div class="dataButtonIcon">
+                <FontAwesomeIcon name="fa-solid fa-file-arrow-up" />
+              </div>
+              Upload data (CSV or JSON)
+            </div>
+          </FancyButton>
+        </div>
+        {#each Object.entries(plusIntegrations) as [integrationType, schema]}
+          <div class="dataButton">
+            <FancyButton on:click={() => (stage = integrationType)}>
+              <div class="dataButtonContent">
+                <div class="dataButtonIcon">
+                  <IntegrationIcon {integrationType} {schema} />
+                </div>
+                {schema.friendlyName}
+              </div>
+            </FancyButton>
+          </div>
+        {/each}
+      </DataPanel>
+    {:else if stage in plusIntegrations}
+      <DatasourceConfigPanel
+        title={plusIntegrations[stage].friendlyName}
+        fields={plusIntegrations[stage].datasource}
+        type={stage}
+        onBack={() => (stage = "data")}
+        onNext={data => {
+          const isGoogle = data.isGoogle
+          delete data.isGoogle
+          return handleCreateApp({ datasourceConfig: data, isGoogle })
+        }}
+      />
+    {:else}
+      <p>There was an problem. Please refresh the page and try again.</p>
+    {/if}
+    <div slot="right">
+      <ExampleApp {name} showData={stage !== "name"} />
+    </div>
+  </SplitPage>
+</div>
 
 <style>
+  .full-width {
+    width: 100%;
+  }
   .centered {
     display: flex;
     justify-content: center;
diff --git a/packages/cli/package.json b/packages/cli/package.json
index a28c66fe65..f59ea2a714 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.6.8",
+  "version": "2.6.10",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "dist/index.js",
   "bin": {
@@ -29,9 +29,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.6.8",
-    "@budibase/string-templates": "^2.6.8",
-    "@budibase/types": "^2.6.8",
+    "@budibase/backend-core": "^2.6.10",
+    "@budibase/string-templates": "^2.6.10",
+    "@budibase/types": "^2.6.10",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 46f365de5d..4fd715ddf6 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.6.8",
+  "version": "2.6.10",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,11 +19,11 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^2.6.8",
-    "@budibase/frontend-core": "^2.6.8",
-    "@budibase/shared-core": "^2.6.8",
-    "@budibase/string-templates": "^2.6.8",
-    "@budibase/types": "^2.6.8",
+    "@budibase/bbui": "^2.6.10",
+    "@budibase/frontend-core": "^2.6.10",
+    "@budibase/shared-core": "^2.6.10",
+    "@budibase/string-templates": "^2.6.10",
+    "@budibase/types": "^2.6.10",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index e701687d10..52a75894a3 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.6.8",
+  "version": "2.6.10",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.6.8",
-    "@budibase/shared-core": "^2.6.8",
+    "@budibase/bbui": "^2.6.10",
+    "@budibase/shared-core": "^2.6.10",
     "dayjs": "^1.11.7",
     "lodash": "^4.17.21",
     "socket.io-client": "^4.6.1",
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 5b528a145a..75a205bd30 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.6.8",
+  "version": "2.6.10",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 7be437535e..7734d3d1ea 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.6.8",
+  "version": "2.6.10",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -45,12 +45,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.6.8",
-    "@budibase/client": "^2.6.8",
-    "@budibase/pro": "2.6.8",
-    "@budibase/shared-core": "^2.6.8",
-    "@budibase/string-templates": "^2.6.8",
-    "@budibase/types": "^2.6.8",
+    "@budibase/backend-core": "^2.6.10",
+    "@budibase/client": "^2.6.10",
+    "@budibase/pro": "2.6.10",
+    "@budibase/shared-core": "^2.6.10",
+    "@budibase/string-templates": "^2.6.10",
+    "@budibase/types": "^2.6.10",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json
index 68d9824126..aa91f71dca 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.6.8",
+  "version": "2.6.10",
   "description": "Shared data utils",
   "main": "dist/cjs/src/index.js",
   "types": "dist/mjs/src/index.d.ts",
@@ -20,7 +20,7 @@
     "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\""
   },
   "dependencies": {
-    "@budibase/types": "^2.6.8"
+    "@budibase/types": "^2.6.10"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 105cb98472..9c80fd31ff 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.6.8",
+  "version": "2.6.10",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 1e8e46c44d..7f54b87c14 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.6.8",
+  "version": "2.6.10",
   "description": "Budibase types",
   "main": "dist/cjs/index.js",
   "types": "dist/mjs/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index ebbe5d62bd..56049f4233 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.6.8",
+  "version": "2.6.10",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -37,10 +37,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.6.8",
-    "@budibase/pro": "2.6.8",
-    "@budibase/string-templates": "^2.6.8",
-    "@budibase/types": "^2.6.8",
+    "@budibase/backend-core": "^2.6.10",
+    "@budibase/pro": "2.6.10",
+    "@budibase/string-templates": "^2.6.10",
+    "@budibase/types": "^2.6.10",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
diff --git a/yarn.lock b/yarn.lock
index 4b2bab4ec2..fd80e8cf00 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1486,15 +1486,15 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.6.7":
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.7.tgz#884b33f3a3e3f2e548fd7519d32b40dc98803400"
-  integrity sha512-f7g+0So7hr7tHHEF28cz550imYpq/CqRNzhMQpUwmzgbdTlOdVej3PWPNK9+MuBlNea3J9b2WQsjS9TkGZfTlA==
+"@budibase/pro@2.6.9":
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.9.tgz#a6c00ca1e684efa7f09f66e6b8c878e129915afb"
+  integrity sha512-e/VWKERuB3Vtux5TwvgT7T9YCk51HbIJlHvV++hzGf+3zPF0VRrFq/0WD553Mj3amLHUk8zsBgfOoPPLiaprtg==
   dependencies:
-    "@budibase/backend-core" "2.6.7"
+    "@budibase/backend-core" "2.6.9"
     "@budibase/shared-core" "2.5.9"
     "@budibase/string-templates" "2.5.9"
-    "@budibase/types" "2.6.7"
+    "@budibase/types" "2.6.9"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"