diff --git a/.vscode/settings.json b/.vscode/settings.json
index 71f0092a59..4838a4fd89 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,7 +8,7 @@
         "editor.defaultFormatter": "vscode.json-language-features"
     },
     "[javascript]": {
-        "editor.defaultFormatter": "vscode.typescript-language-features"
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
     "debug.javascript.terminalOptions": {
         "skipFiles": [
@@ -16,7 +16,4 @@
             "<node_internals>/**"
         ]
     },
-    "[typescript]": {
-        "editor.defaultFormatter": "vscode.typescript-language-features"
-    },
 }
diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index 5cac1fb9d8..0d05e170e0 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -69,7 +69,9 @@
   $: unlocked = lockedApps?.length === 0
   $: automationErrors = getAutomationErrors(enrichedApps)
 
-  $: isProPlan = $auth.user?.license.plan.type !== Constants.PlanType.FREE
+  $: hasGroupsLicense = $auth.user?.license.features.includes(
+    Constants.Features.USER_GROUPS
+  )
 
   const enrichApps = (apps, user, sortBy) => {
     const enrichedApps = apps.map(app => ({
@@ -358,7 +360,7 @@
                   </Button>
                 {/if}
                 <div class="filter">
-                  {#if isProPlan && $groups.length}
+                  {#if hasGroupsLicense && $groups.length}
                     <AccessFilter on:change={accessFilterAction} />
                   {/if}
                   <Select
diff --git a/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte b/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte
index 9cd922cc58..75936f5bf6 100644
--- a/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte
+++ b/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte
@@ -31,7 +31,7 @@
   $: page = $pageInfo.page
   $: fetchUsers(page, search)
   $: group = $groups.find(x => x._id === groupId)
-  $: console.log(group.users)
+
   async function addAll() {
     group.users = selectedUsers
     await groups.actions.save(group)
diff --git a/packages/builder/src/pages/builder/portal/manage/groups/index.svelte b/packages/builder/src/pages/builder/portal/manage/groups/index.svelte
index 2dd80506a8..e334fe4307 100644
--- a/packages/builder/src/pages/builder/portal/manage/groups/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/groups/index.svelte
@@ -15,7 +15,9 @@
   import CreateEditGroupModal from "./_components/CreateEditGroupModal.svelte"
   import UserGroupsRow from "./_components/UserGroupsRow.svelte"
 
-  $: isProPlan = $auth.user?.license.plan.type !== Constants.PlanType.FREE
+  $: hasGroupsLicense = $auth.user?.license.features.includes(
+    Constants.Features.USER_GROUPS
+  )
 
   let modal
   let group = {
@@ -45,7 +47,9 @@
 
   onMount(async () => {
     try {
-      await groups.actions.init()
+      if (hasGroupsLicense) {
+        await groups.actions.init()
+      }
     } catch (error) {
       notifications.error("Error getting User groups")
     }
@@ -56,7 +60,7 @@
   <Layout gap="XS" noPadding>
     <div style="display: flex;">
       <Heading size="M">User groups</Heading>
-      {#if !isProPlan}
+      {#if !hasGroupsLicense}
         <Tags>
           <div class="tags">
             <div class="tag">
@@ -71,14 +75,14 @@
   <div class="align-buttons">
     <Button
       newStyles
-      icon={isProPlan ? "UserGroup" : ""}
-      cta={isProPlan}
-      on:click={isProPlan
+      icon={hasGroupsLicense ? "UserGroup" : ""}
+      cta={hasGroupsLicense}
+      on:click={hasGroupsLicense
         ? () => modal.show()
         : window.open("https://budibase.com/pricing/", "_blank")}
-      >{isProPlan ? "Create user group" : "Upgrade Account"}</Button
+      >{hasGroupsLicense ? "Create user group" : "Upgrade Account"}</Button
     >
-    {#if !isProPlan}
+    {#if !hasGroupsLicense}
       <Button
         newStyles
         secondary
@@ -89,7 +93,7 @@
     {/if}
   </div>
 
-  {#if isProPlan}
+  {#if hasGroupsLicense}
     <div class="groupTable">
       {#each $groups as group}
         <div>
diff --git a/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte b/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte
index 973daa3b61..7556efd185 100644
--- a/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte
+++ b/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte
@@ -41,7 +41,9 @@
   let allAppList = []
 
   $: user = users.get(userId)
-  $: isProPlan = $auth.user?.license.plan.type !== Constants.PlanType.FREE
+  $: hasGroupsLicense = $auth.user?.license.features.includes(
+    Constants.Features.USER_GROUPS
+  )
 
   $: allAppList = $apps
     .filter(x => {
@@ -70,7 +72,6 @@
       selectedGroups &&
       group?.name?.toLowerCase().includes(searchTerm.toLowerCase())
   )
-  $: console.log($groups)
   $: userGroups = $groups.filter(x => {
     return x.users?.find(y => {
       return y._id === userId
@@ -236,7 +237,7 @@
     </div>
   </Layout>
 
-  {#if isProPlan}
+  {#if hasGroupsLicense}
     <!-- User groups -->
     <Layout gap="XS" noPadding>
       <div class="tableTitle">
diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte
index 99da91a603..1997d4292a 100644
--- a/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte
@@ -15,7 +15,9 @@
   let disabled
   let userGroups = []
 
-  $: isProPlan = $auth.user?.license.plan.type !== Constants.PlanType.FREE
+  $: hasGroupsLicense = $auth.user?.license.features.includes(
+    Constants.Features.USER_GROUPS
+  )
 
   $: userData = [
     {
@@ -65,7 +67,7 @@
     </div>
   </Layout>
 
-  {#if isProPlan}
+  {#if hasGroupsLicense}
     <Multiselect
       bind:value={userGroups}
       placeholder="Select User Groups"
diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/ImportUsersModal.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/ImportUsersModal.svelte
index 29dad4dacd..3d85201fdc 100644
--- a/packages/builder/src/pages/builder/portal/manage/users/_components/ImportUsersModal.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/users/_components/ImportUsersModal.svelte
@@ -22,7 +22,9 @@
   let usersRole = null
 
   $: invalidEmails = []
-  $: isProPlan = $auth.user?.license.plan.type !== Constants.PlanType.FREE
+  $: hasGroupsLicense = $auth.user?.license.features.includes(
+    Constants.Features.USER_GROUPS
+  )
 
   const validEmails = userEmails => {
     for (const email of userEmails) {
@@ -87,7 +89,7 @@
     options={Constants.BuilderRoleDescriptions}
   />
 
-  {#if isProPlan}
+  {#if hasGroupsLicense}
     <Multiselect
       bind:value={userGroups}
       placeholder="Select User Groups"
diff --git a/packages/builder/src/pages/builder/portal/manage/users/index.svelte b/packages/builder/src/pages/builder/portal/manage/users/index.svelte
index 938f92850b..4b20166f00 100644
--- a/packages/builder/src/pages/builder/portal/manage/users/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/users/index.svelte
@@ -64,7 +64,9 @@
     { column: "role", component: RoleTableRenderer },
   ]
 
-  $: isProPlan = $auth.user?.license.plan.type !== Constants.PlanType.FREE
+  $: hasGroupsLicense = $auth.user?.license.features.includes(
+    Constants.Features.USER_GROUPS
+  )
 
   $: schema = {
     name: {},
@@ -73,7 +75,7 @@
       noPropagation: true,
       sortable: false,
     },
-    ...(isProPlan && {
+    ...(hasGroupsLicense && {
       userGroups: { sortable: false, displayName: "User groups" },
     }),
     apps: { width: "120px" },
diff --git a/packages/builder/src/pages/builder/portal/overview/_components/AccessTab.svelte b/packages/builder/src/pages/builder/portal/overview/_components/AccessTab.svelte
index c10a704af1..66515ba323 100644
--- a/packages/builder/src/pages/builder/portal/overview/_components/AccessTab.svelte
+++ b/packages/builder/src/pages/builder/portal/overview/_components/AccessTab.svelte
@@ -31,7 +31,9 @@
   $: page = $pageInfo.page
   $: fetchUsers(page, search)
 
-  $: isProPlan = $auth.user?.license.plan.type !== Constants.PlanType.FREE
+  $: hasGroupsLicense = $auth.user?.license.features.includes(
+    Constants.Features.USER_GROUPS
+  )
 
   $: appUsers =
     $users.data?.filter(x => {
@@ -158,7 +160,7 @@
           >
         </div>
       </div>
-      {#if isProPlan && appGroups.length}
+      {#if hasGroupsLicense && appGroups.length}
         <List title="User Groups">
           {#each appGroups as group}
             <ListItem
diff --git a/packages/builder/src/stores/portal/groups.js b/packages/builder/src/stores/portal/groups.js
index d2189cbabc..e9fefd21a8 100644
--- a/packages/builder/src/stores/portal/groups.js
+++ b/packages/builder/src/stores/portal/groups.js
@@ -1,5 +1,7 @@
-import { writable } from "svelte/store"
+import { writable, get } from "svelte/store"
 import { API } from "api"
+import { auth } from "stores/portal"
+import { Constants } from "@budibase/frontend-core"
 
 export function createGroupsStore() {
   const DEFAULT_CONFIG = {
@@ -15,8 +17,14 @@ export function createGroupsStore() {
 
   const actions = {
     init: async () => {
-      const users = await API.getGroups()
-      store.set(users)
+      // only init if these is a groups license, just to be sure but the feature will be blocked
+      // on the backend anyway
+      if (
+        get(auth).user.license.features.includes(Constants.Features.USER_GROUPS)
+      ) {
+        const users = await API.getGroups()
+        store.set(users)
+      }
     },
 
     save: async group => {
diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js
index 561cc26084..a160c052f0 100644
--- a/packages/frontend-core/src/constants.js
+++ b/packages/frontend-core/src/constants.js
@@ -99,6 +99,10 @@ export const PlanType = {
  */
 export const ApiVersion = "1"
 
+export const Features = {
+  USER_GROUPS: "userGroups",
+}
+
 // Role IDs
 export const Roles = {
   ADMIN: "ADMIN",
diff --git a/packages/server/src/api/routes/tests/user.spec.js b/packages/server/src/api/routes/tests/user.spec.js
index 29c33b3899..1f1c1755cd 100644
--- a/packages/server/src/api/routes/tests/user.spec.js
+++ b/packages/server/src/api/routes/tests/user.spec.js
@@ -33,6 +33,7 @@ describe("/users", () => {
         .expect(200)
 
       expect(res.body.length).toBe(3)
+      console.debug('test: ' + JSON.stringify(res.body))
       expect(res.body.find(u => u._id === `ro_ta_users_us_uuidx`)).toBeDefined()
       expect(res.body.find(u => u._id === `ro_ta_users_us_uuidy`)).toBeDefined()
     })
diff --git a/packages/worker/src/api/routes/index.js b/packages/worker/src/api/routes/index.js
index a57a8690f7..361c52fb18 100644
--- a/packages/worker/src/api/routes/index.js
+++ b/packages/worker/src/api/routes/index.js
@@ -11,7 +11,9 @@ const tenantsRoutes = require("./system/tenants")
 const statusRoutes = require("./system/status")
 const selfRoutes = require("./global/self")
 const licenseRoutes = require("./global/license")
-const userGroupRoutes = require("./global/groups")
+const { api } = require("@budibase/pro")
+
+let userGroupRoutes = api.groups
 exports.routes = [
   configRoutes,
   userRoutes,