diff --git a/lerna.json b/lerna.json
index 31acac22a6..4f81990b7e 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.150-alpha.0",
+  "version": "0.9.151-alpha.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index e84b5a7029..cffefeb291 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.150-alpha.0",
+  "version": "0.9.151-alpha.0",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 62e1c68278..c7cdd5ed31 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": "0.9.150-alpha.0",
+  "version": "0.9.151-alpha.0",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 3cbf160cbf..5c98b5bb01 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.150-alpha.0",
+  "version": "0.9.151-alpha.0",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.150-alpha.0",
-    "@budibase/client": "^0.9.150-alpha.0",
+    "@budibase/bbui": "^0.9.151-alpha.0",
+    "@budibase/client": "^0.9.151-alpha.0",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.150-alpha.0",
+    "@budibase/string-templates": "^0.9.151-alpha.0",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index e92f47cae9..c567454eff 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -8,7 +8,6 @@ import {
   selectedComponent,
   selectedAccessRole,
 } from "builderStore"
-import { notifications } from "@budibase/bbui"
 import {
   datasources,
   integrations,
@@ -16,7 +15,6 @@ import {
   database,
   tables,
 } from "stores/backend"
-
 import { fetchComponentLibDefinitions } from "../loadComponentLibraries"
 import api from "../api"
 import { FrontendTypes } from "constants"
@@ -472,8 +470,7 @@ export const getFrontendStore = () => {
 
         // Ensure we aren't deleting the screen slot
         if (component._component?.endsWith("/screenslot")) {
-          notifications.error("You can't delete the screen slot")
-          return
+          throw "You can't delete the screen slot"
         }
 
         // Ensure we aren't deleting something that contains the screen slot
@@ -482,10 +479,7 @@ export const getFrontendStore = () => {
           "@budibase/standard-components/screenslot"
         )
         if (screenslot != null) {
-          notifications.error(
-            "You can't delete a component that contains the screen slot"
-          )
-          return
+          throw "You can't delete a component that contains the screen slot"
         }
 
         const parent = findComponentParent(asset.props, component._id)
diff --git a/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte b/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte
index 4e51850fe1..d2d67bf99f 100644
--- a/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte
+++ b/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte
@@ -6,7 +6,13 @@
   import { Screen } from "builderStore/store/screenTemplates/utils/Screen"
   import { FrontendTypes } from "constants"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
-  import { ProgressCircle, Layout, Heading, Body } from "@budibase/bbui"
+  import {
+    ProgressCircle,
+    Layout,
+    Heading,
+    Body,
+    notifications,
+  } from "@budibase/bbui"
   import ErrorSVG from "assets/error.svg?raw"
   import { findComponent, findComponentPath } from "builderStore/storeUtils"
 
@@ -166,10 +172,15 @@
     confirmDeleteDialog.show()
   }
 
-  const deleteComponent = () => {
-    store.actions.components.delete({ _id: idToDelete })
+  const deleteComponent = async () => {
+    try {
+      await store.actions.components.delete({ _id: idToDelete })
+    } catch (error) {
+      notifications.error(error)
+    }
     idToDelete = null
   }
+
   const cancelDeleteComponent = () => {
     idToDelete = null
   }
diff --git a/packages/builder/src/components/design/NavigationPanel/ComponentDropdownMenu.svelte b/packages/builder/src/components/design/NavigationPanel/ComponentDropdownMenu.svelte
index 24050e1088..c3f51ee5df 100644
--- a/packages/builder/src/components/design/NavigationPanel/ComponentDropdownMenu.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/ComponentDropdownMenu.svelte
@@ -3,7 +3,7 @@
   import { store, currentAsset } from "builderStore"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import { findComponentParent } from "builderStore/storeUtils"
-  import { ActionMenu, MenuItem, Icon } from "@budibase/bbui"
+  import { ActionMenu, MenuItem, Icon, notifications } from "@budibase/bbui"
 
   export let component
 
@@ -51,7 +51,11 @@
   }
 
   const deleteComponent = async () => {
-    await store.actions.components.delete(component)
+    try {
+      await store.actions.components.delete(component)
+    } catch (error) {
+      notifications.error(error)
+    }
   }
 
   const storeComponentForCopy = (cut = false) => {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index cd6738f95b..5d262579ed 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.150-alpha.0",
+  "version": "0.9.151-alpha.0",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 04ca81e005..b65403a4b5 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.150-alpha.0",
+  "version": "0.9.151-alpha.0",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.150-alpha.0",
+    "@budibase/bbui": "^0.9.151-alpha.0",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^0.9.150-alpha.0",
+    "@budibase/string-templates": "^0.9.151-alpha.0",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index d6e7479100..a67d52ba30 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.150-alpha.0",
+  "version": "0.9.151-alpha.0",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -66,9 +66,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.150-alpha.0",
-    "@budibase/client": "^0.9.150-alpha.0",
-    "@budibase/string-templates": "^0.9.150-alpha.0",
+    "@budibase/auth": "^0.9.151-alpha.0",
+    "@budibase/client": "^0.9.151-alpha.0",
+    "@budibase/string-templates": "^0.9.151-alpha.0",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
diff --git a/packages/server/src/utilities/usageQuota.js b/packages/server/src/utilities/usageQuota.js
index 80fddb8303..1980b13ef0 100644
--- a/packages/server/src/utilities/usageQuota.js
+++ b/packages/server/src/utilities/usageQuota.js
@@ -58,7 +58,7 @@ exports.update = async (property, usage) => {
     // increment the quota
     quota.usageQuota[property] += usage
 
-    if (quota.usageQuota[property] >= quota.usageLimits[property]) {
+    if (quota.usageQuota[property] > quota.usageLimits[property]) {
       throw new Error(
         `You have exceeded your usage quota of ${quota.usageLimits[property]} ${property}.`
       )
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 822d3801f1..c07a5f2276 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.150-alpha.0",
+  "version": "0.9.151-alpha.0",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 3121bac886..8b4224cc23 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.150-alpha.0",
+  "version": "0.9.151-alpha.0",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -27,8 +27,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.150-alpha.0",
-    "@budibase/string-templates": "^0.9.150-alpha.0",
+    "@budibase/auth": "^0.9.151-alpha.0",
+    "@budibase/string-templates": "^0.9.151-alpha.0",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",
diff --git a/packages/worker/src/utilities/email.js b/packages/worker/src/utilities/email.js
index 14c836952e..fb30591908 100644
--- a/packages/worker/src/utilities/email.js
+++ b/packages/worker/src/utilities/email.js
@@ -113,7 +113,7 @@ async function getSmtpConfiguration(db, workspaceId = null, automation) {
     params.workspace = workspaceId
   }
 
-  const customConfig = getScopedConfig(db, params)
+  const customConfig = await getScopedConfig(db, params)
 
   if (customConfig) {
     return customConfig
@@ -125,6 +125,7 @@ async function getSmtpConfiguration(db, workspaceId = null, automation) {
       port: env.SMTP_PORT,
       host: env.SMTP_HOST,
       secure: false,
+      from: env.SMTP_FROM_ADDRESS,
       auth: {
         user: env.SMTP_USER,
         pass: env.SMTP_PASSWORD,