diff --git a/packages/builder/src/pages/builder/_layout.svelte b/packages/builder/src/pages/builder/_layout.svelte
index cde1d332b2..ce883ee541 100644
--- a/packages/builder/src/pages/builder/_layout.svelte
+++ b/packages/builder/src/pages/builder/_layout.svelte
@@ -4,7 +4,9 @@
   import { onMount } from "svelte"
 
   let loaded = false
+  $: multiTenancyEnabled = $admin.multiTenancy
   $: hasAdminUser = !!$admin?.checklist?.adminUser
+  $: tenantSet = $auth.tenantSet
 
   onMount(async () => {
     await admin.init()
@@ -14,7 +16,9 @@
 
   // Force creation of an admin user if one doesn't exist
   $: {
-    if (loaded && !hasAdminUser) {
+    if (loaded && multiTenancyEnabled && !tenantSet) {
+      $redirect("./auth/org")
+    } else if (loaded && !hasAdminUser) {
       $redirect("./admin")
     }
   }
diff --git a/packages/builder/src/pages/builder/admin/index.svelte b/packages/builder/src/pages/builder/admin/index.svelte
index 4a6ded819a..cf882132ad 100644
--- a/packages/builder/src/pages/builder/admin/index.svelte
+++ b/packages/builder/src/pages/builder/admin/index.svelte
@@ -9,15 +9,18 @@
   } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
   import api from "builderStore/api"
-  import { admin } from "stores/portal"
+  import { admin, auth } from "stores/portal"
   import PasswordRepeatInput from "components/common/users/PasswordRepeatInput.svelte"
   import Logo from "assets/bb-emblem.svg"
 
   let adminUser = {}
   let error
 
+  $: tenantId = $auth.tenantId
+
   async function save() {
     try {
+      adminUser.tenantId = tenantId
       // Save the admin user
       const response = await api.post(`/api/admin/users/init`, adminUser)
       const json = await response.json()
@@ -44,7 +47,6 @@
         </Body>
       </Layout>
       <Layout gap="XS" noPadding>
-        <Input label="Organisation" bind:value={adminUser.tenantId} />
         <Input label="Email" bind:value={adminUser.email} />
         <PasswordRepeatInput bind:password={adminUser.password} bind:error />
       </Layout>
diff --git a/packages/builder/src/pages/builder/auth/index.svelte b/packages/builder/src/pages/builder/auth/index.svelte
index d335c3dfba..bbdd9949ba 100644
--- a/packages/builder/src/pages/builder/auth/index.svelte
+++ b/packages/builder/src/pages/builder/auth/index.svelte
@@ -1,5 +1,24 @@
 <script>
   import { redirect } from "@roxi/routify"
-  // TODO: need to check if the tenant is already set
-  $redirect("./org")
+  import { auth, admin } from "stores/portal"
+  import { onMount } from "svelte"
+
+  $: tenantSet = $auth.tenantSet
+  $: multiTenancyEnabled = $admin.multiTenancy
+
+  let loaded = false
+
+  $: {
+    console.log(loaded)
+    if (loaded && multiTenancyEnabled && !tenantSet) {
+      $redirect("./org")
+    } else if (loaded) {
+      $redirect("./login")
+    }
+  }
+
+  onMount(async () => {
+    await admin.init()
+    loaded = true
+  })
 </script>
diff --git a/packages/builder/src/pages/builder/auth/org.svelte b/packages/builder/src/pages/builder/auth/org.svelte
index 33692030b9..ee3f2b9d4a 100644
--- a/packages/builder/src/pages/builder/auth/org.svelte
+++ b/packages/builder/src/pages/builder/auth/org.svelte
@@ -1,14 +1,16 @@
 <script>
   import { Body, Button, Divider, Heading, Input, Layout } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
-  import { auth } from "stores/portal"
+  import { auth, admin } from "stores/portal"
   import Logo from "assets/bb-emblem.svg"
 
   let tenantId = ""
 
   async function setOrg() {
     auth.setOrg(tenantId)
-    $goto("./login")
+    // re-init now org selected
+    await admin.init()
+    $goto("../")
   }
 
   function handleKeydown(evt) {
diff --git a/packages/builder/src/pages/builder/index.svelte b/packages/builder/src/pages/builder/index.svelte
index a4fe10f10d..a90e1c7f2b 100644
--- a/packages/builder/src/pages/builder/index.svelte
+++ b/packages/builder/src/pages/builder/index.svelte
@@ -4,7 +4,7 @@
 
   $: {
     if (!$auth.user) {
-      $redirect("./auth/login")
+      $redirect("./auth")
     } else if ($auth.user.builder?.global) {
       $redirect("./portal")
     } else {
diff --git a/packages/builder/src/pages/builder/portal/manage/email/index.svelte b/packages/builder/src/pages/builder/portal/manage/email/index.svelte
index 4a2b21b691..f45f4ea299 100644
--- a/packages/builder/src/pages/builder/portal/manage/email/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/email/index.svelte
@@ -90,10 +90,13 @@
     }
     loading = false
     requireAuth = smtpConfig.config.auth != null
+    console.log(requireAuth)
     // always attach the auth for the forms purpose -
     // this will be removed later if required
-    smtpConfig.config.auth = {
-      type: "login",
+    if (!smtpDoc.config.auth) {
+      smtpConfig.config.auth = {
+        type: "login",
+      }
     }
   }
 
diff --git a/packages/builder/src/stores/portal/admin.js b/packages/builder/src/stores/portal/admin.js
index 1902e17a29..b547e09027 100644
--- a/packages/builder/src/stores/portal/admin.js
+++ b/packages/builder/src/stores/portal/admin.js
@@ -3,7 +3,7 @@ import api from "builderStore/api"
 import { auth } from "stores/portal"
 
 export function createAdminStore() {
-  const { subscribe, set } = writable({})
+  const admin = writable({})
 
   async function init() {
     try {
@@ -20,19 +20,38 @@ export function createAdminStore() {
         0
       )
 
-      set({
-        checklist: json,
-        onboardingProgress: (stepsComplete / onboardingSteps.length) * 100,
+      admin.update(store => {
+        store.checklist = json
+        store.onboardingProgress = (stepsComplete / onboardingSteps.length) * 100
+        return store
       })
+      await multiTenancyEnabled()
     } catch (err) {
-      set({
-        checklist: null,
+      admin.update( store => {
+        store.checklist = null
+        return store
       })
     }
   }
 
+  async function multiTenancyEnabled() {
+    let enabled = false
+    try {
+      const response = await api.get(`/api/admin/tenants/enabled`)
+      const json = await response.json()
+      enabled = json.enabled
+    } catch (err) {
+      // just let it stay disabled
+    }
+    admin.update(store => {
+      store.multiTenancy = enabled
+      return store
+    })
+    return enabled
+  }
+
   return {
-    subscribe,
+    subscribe: admin.subscribe,
     init,
   }
 }
diff --git a/packages/builder/src/stores/portal/auth.js b/packages/builder/src/stores/portal/auth.js
index da26025d09..9723f29d45 100644
--- a/packages/builder/src/stores/portal/auth.js
+++ b/packages/builder/src/stores/portal/auth.js
@@ -5,6 +5,7 @@ export function createAuthStore() {
   const auth = writable({
     user: null,
     tenantId: "default",
+    tenantSet: false,
   })
   const store = derived(auth, $store => {
     let initials = null
@@ -28,6 +29,7 @@ export function createAuthStore() {
     return {
       user: $store.user,
       tenantId: $store.tenantId,
+      tenantSet: $store.tenantSet,
       initials,
       isAdmin,
       isBuilder,
@@ -46,6 +48,7 @@ export function createAuthStore() {
     setOrg: tenantId => {
       auth.update(store => {
         store.tenantId = tenantId
+        store.tenantSet = true
         return store
       })
     },
diff --git a/packages/worker/scripts/dev/manage.js b/packages/worker/scripts/dev/manage.js
index b9d28b6278..a40391b396 100644
--- a/packages/worker/scripts/dev/manage.js
+++ b/packages/worker/scripts/dev/manage.js
@@ -12,12 +12,11 @@ async function init() {
     INTERNAL_API_KEY: "budibase",
     MINIO_ACCESS_KEY: "budibase",
     MINIO_SECRET_KEY: "budibase",
-    COUCH_DB_USER: "budibase",
-    COUCH_DB_PASSWORD: "budibase",
     REDIS_URL: "localhost:6379",
     REDIS_PASSWORD: "budibase",
     MINIO_URL: "http://localhost:10000/",
     COUCH_DB_URL: "http://budibase:budibase@localhost:10000/db/",
+    MULTI_TENANCY: false,
   }
   let envFile = ""
   Object.keys(envFileJson).forEach(key => {
diff --git a/packages/worker/src/api/controllers/admin/tenants.js b/packages/worker/src/api/controllers/admin/tenants.js
index 76abb4510e..fe2eac2905 100644
--- a/packages/worker/src/api/controllers/admin/tenants.js
+++ b/packages/worker/src/api/controllers/admin/tenants.js
@@ -1,5 +1,9 @@
-exports.multiTenancyEnabled = async ctx => {
+const env = require("../../../environment")
 
+exports.multiTenancyEnabled = async ctx => {
+  ctx.body = {
+    enabled: !!env.MULTI_TENANCY,
+  }
 }
 
 exports.exists = async ctx => {
diff --git a/packages/worker/src/api/index.js b/packages/worker/src/api/index.js
index a62cd4db58..0cea638473 100644
--- a/packages/worker/src/api/index.js
+++ b/packages/worker/src/api/index.js
@@ -41,6 +41,10 @@ const PUBLIC_ENDPOINTS = [
     route: "/api/admin/configs/public",
     method: "GET",
   },
+  {
+    route: "api/admin/tenants/enabled",
+    method: "GET",
+  }
 ]
 
 const router = new Router()
diff --git a/packages/worker/src/api/routes/admin/tenants.js b/packages/worker/src/api/routes/admin/tenants.js
index 3f13d5a324..5c7c6f1d57 100644
--- a/packages/worker/src/api/routes/admin/tenants.js
+++ b/packages/worker/src/api/routes/admin/tenants.js
@@ -1,8 +1,5 @@
 const Router = require("@koa/router")
 const controller = require("../../controllers/admin/tenants")
-const joiValidator = require("../../../middleware/joi-validator")
-const Joi = require("joi")
-const { TemplatePurpose, TemplateTypes } = require("../../../constants")
 const adminOnly = require("../../../middleware/adminOnly")
 
 const router = Router()
diff --git a/packages/worker/src/api/routes/index.js b/packages/worker/src/api/routes/index.js
index 64988c4dca..a4f2c852d1 100644
--- a/packages/worker/src/api/routes/index.js
+++ b/packages/worker/src/api/routes/index.js
@@ -2,6 +2,7 @@ const userRoutes = require("./admin/users")
 const configRoutes = require("./admin/configs")
 const workspaceRoutes = require("./admin/workspaces")
 const templateRoutes = require("./admin/templates")
+const tenantsRoutes = require("./admin/tenants")
 const emailRoutes = require("./admin/email")
 const authRoutes = require("./admin/auth")
 const roleRoutes = require("./admin/roles")
@@ -15,6 +16,7 @@ exports.routes = [
   authRoutes,
   appRoutes,
   templateRoutes,
+  tenantsRoutes,
   emailRoutes,
   sessionRoutes,
   roleRoutes,
diff --git a/packages/worker/src/environment.js b/packages/worker/src/environment.js
index 384230b9b3..7c631bf86d 100644
--- a/packages/worker/src/environment.js
+++ b/packages/worker/src/environment.js
@@ -30,9 +30,7 @@ module.exports = {
   REDIS_URL: process.env.REDIS_URL,
   REDIS_PASSWORD: process.env.REDIS_PASSWORD,
   INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
-  /* TODO: to remove - once deployment removed */
-  COUCH_DB_USERNAME: process.env.COUCH_DB_USERNAME,
-  COUCH_DB_PASSWORD: process.env.COUCH_DB_PASSWORD,
+  MULTI_TENANCY: process.env.MULTI_TENANCY,
   _set(key, value) {
     process.env[key] = value
     module.exports[key] = value