diff --git a/packages/client/src/components/MadeInBudibase.svelte b/packages/client/src/components/MadeInBudibase.svelte
index 2e5d6336f1..ef31a9cfb5 100644
--- a/packages/client/src/components/MadeInBudibase.svelte
+++ b/packages/client/src/components/MadeInBudibase.svelte
@@ -1,15 +1,20 @@
-<a
+<script>
+  import { Link } from "@budibase/bbui"
+</script>
+
+<Link
   href="https://www.budibase.com/?utm_source=budibase-apps-public-screens&utm_medium=badge&utm_campaign=made-in-budibase"
+  target="_blank"
 >
   <div>
     <img src="https://i.imgur.com/Xhdt1YP.png" alt="Budibase" />
     <p>Made In Budibase</p>
   </div>
-</a>
+</Link>
 
 <style>
   div {
-    position: absolute;
+    position: fixed;
     right: 20px;
     bottom: 20px;
     padding: 10px;
@@ -27,12 +32,7 @@
 
   p {
     text-decoration: none;
-    color: var(--spectrum-heading-m-text-color);
-  }
-
-  a:visited {
-    text-decoration: none;
-    color: var(--spectrum-heading-m-text-color);
+    color: var(--spectrum-global-color-gray-900);
   }
 
   img {
diff --git a/packages/client/src/components/app/Layout.svelte b/packages/client/src/components/app/Layout.svelte
index e58d4ece0c..7897782b3e 100644
--- a/packages/client/src/components/app/Layout.svelte
+++ b/packages/client/src/components/app/Layout.svelte
@@ -5,9 +5,18 @@
   import { FieldTypes } from "constants"
   import active from "svelte-spa-router/active"
   import { RoleUtils } from "@budibase/frontend-core"
+  import MadeInBudibase from "../MadeInBudibase.svelte"
+  import licensing from "../../licensing"
 
   const sdk = getContext("sdk")
-  const { routeStore, styleable, linkable, builderStore, currentRole } = sdk
+  const {
+    routeStore,
+    styleable,
+    linkable,
+    builderStore,
+    currentRole,
+    environmentStore,
+  } = sdk
   const component = getContext("component")
   const context = getContext("context")
 
@@ -225,6 +234,11 @@
       </div>
     </div>
   {/if}
+
+  {#if !$builderStore.inBuilder && licensing.logoEnabled() && $environmentStore.cloud}
+    <MadeInBudibase />
+  {/if}
+
   <div class="main-wrapper">
     <div class="main size--{pageWidthClass}">
       <slot />
diff --git a/packages/client/src/licensing/constants.js b/packages/client/src/licensing/constants.js
new file mode 100644
index 0000000000..dd6e8eb405
--- /dev/null
+++ b/packages/client/src/licensing/constants.js
@@ -0,0 +1,6 @@
+export const PlanType = {
+  FREE: "free",
+  TEAM: "team",
+  BUSINESS: "business",
+  ENTERPRISE: "enterprise",
+}
diff --git a/packages/client/src/licensing/features.js b/packages/client/src/licensing/features.js
new file mode 100644
index 0000000000..1f0d4a4870
--- /dev/null
+++ b/packages/client/src/licensing/features.js
@@ -0,0 +1,5 @@
+import { isFreePlan } from "./utils.js"
+
+export const logoEnabled = () => {
+  return isFreePlan()
+}
diff --git a/packages/client/src/licensing/index.js b/packages/client/src/licensing/index.js
new file mode 100644
index 0000000000..6993910704
--- /dev/null
+++ b/packages/client/src/licensing/index.js
@@ -0,0 +1,7 @@
+import * as features from "./features"
+
+const licensing = {
+  ...features,
+}
+
+export default licensing
diff --git a/packages/client/src/licensing/utils.js b/packages/client/src/licensing/utils.js
new file mode 100644
index 0000000000..efe1839ecb
--- /dev/null
+++ b/packages/client/src/licensing/utils.js
@@ -0,0 +1,20 @@
+import { authStore } from "../stores/auth.js"
+import { get } from "svelte/store"
+import { PlanType } from "./constants"
+
+const getLicense = () => {
+  const user = get(authStore)
+  if (user) {
+    return user.license
+  }
+}
+
+export const isFreePlan = () => {
+  const license = getLicense()
+  if (license) {
+    return license.plan.type === PlanType.FREE
+  } else {
+    // safety net - no license means free plan
+    return true
+  }
+}
diff --git a/packages/client/src/sdk.js b/packages/client/src/sdk.js
index 13190e0a4f..aa778388f6 100644
--- a/packages/client/src/sdk.js
+++ b/packages/client/src/sdk.js
@@ -9,6 +9,7 @@ import {
   rowSelectionStore,
   componentStore,
   currentRole,
+  environmentStore,
 } from "stores"
 import { styleable } from "utils/styleable"
 import { linkable } from "utils/linkable"
@@ -27,6 +28,7 @@ export default {
   builderStore,
   uploadStore,
   componentStore,
+  environmentStore,
   currentRole,
   styleable,
   linkable,
diff --git a/packages/client/src/stores/environment.js b/packages/client/src/stores/environment.js
new file mode 100644
index 0000000000..ebeb67c622
--- /dev/null
+++ b/packages/client/src/stores/environment.js
@@ -0,0 +1,31 @@
+import { API } from "api"
+import { writable } from "svelte/store"
+
+const initialState = {
+  cloud: false,
+}
+
+const createEnvironmentStore = () => {
+  const store = writable(initialState)
+
+  const actions = {
+    fetchEnvironment: async () => {
+      try {
+        const environment = await API.getEnvironment()
+        store.set({
+          ...initialState,
+          ...environment,
+        })
+      } catch (error) {
+        store.set(initialState)
+      }
+    },
+  }
+
+  return {
+    subscribe: store.subscribe,
+    actions,
+  }
+}
+
+export const environmentStore = createEnvironmentStore()
diff --git a/packages/client/src/stores/index.js b/packages/client/src/stores/index.js
index e28fbaee42..378d3febd2 100644
--- a/packages/client/src/stores/index.js
+++ b/packages/client/src/stores/index.js
@@ -17,6 +17,7 @@ export { devToolsStore } from "./devTools"
 export { componentStore } from "./components"
 export { uploadStore } from "./uploads.js"
 export { rowSelectionStore } from "./rowSelection.js"
+export { environmentStore } from "./environment"
 
 // Context stores are layered and duplicated, so it is not a singleton
 export { createContextStore } from "./context"
diff --git a/packages/client/src/stores/initialise.js b/packages/client/src/stores/initialise.js
index 1900e62ce1..4ad85dfd40 100644
--- a/packages/client/src/stores/initialise.js
+++ b/packages/client/src/stores/initialise.js
@@ -1,7 +1,9 @@
 import { routeStore } from "./routes"
 import { appStore } from "./app"
+import { environmentStore } from "./environment"
 
 export async function initialise() {
   await routeStore.actions.fetchRoutes()
   await appStore.actions.fetchAppDefinition()
+  await environmentStore.actions.fetchEnvironment()
 }
diff --git a/packages/server/src/api/controllers/auth.js b/packages/server/src/api/controllers/auth.js
index 03480f62fb..51ce737c41 100644
--- a/packages/server/src/api/controllers/auth.js
+++ b/packages/server/src/api/controllers/auth.js
@@ -4,6 +4,15 @@ const { getFullUser } = require("../../utilities/users")
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
 const { getAppDB, getAppId } = require("@budibase/backend-core/context")
 
+/**
+ * Add the attributes that are session based to the current user.
+ */
+const addSessionAttributesToUser = ctx => {
+  if (ctx.user) {
+    ctx.body.license = ctx.user.license
+  }
+}
+
 exports.fetchSelf = async ctx => {
   let userId = ctx.user.userId || ctx.user._id
   /* istanbul ignore next */
@@ -55,4 +64,6 @@ exports.fetchSelf = async ctx => {
   } else {
     ctx.body = user
   }
+
+  addSessionAttributesToUser(ctx)
 }