diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts
index 37804b31a6..563d9a9243 100644
--- a/packages/backend-core/src/environment.ts
+++ b/packages/backend-core/src/environment.ts
@@ -43,7 +43,7 @@ const env = {
   PLATFORM_URL: process.env.PLATFORM_URL || "",
   POSTHOG_TOKEN: process.env.POSTHOG_TOKEN,
   ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS,
-  TENANT_FEATURE_FLAGS: process.env.TENANT_FEATURE_FLAGS,
+  TENANT_FEATURE_FLAGS: "default:USER_GROUPS",
   BACKUPS_BUCKET_NAME: process.env.BACKUPS_BUCKET_NAME || "backups",
   APPS_BUCKET_NAME: process.env.APPS_BUCKET_NAME || "prod-budi-app-assets",
   TEMPLATES_BUCKET_NAME: process.env.TEMPLATES_BUCKET_NAME || "templates",
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 948e77a66e..45bd8ed1b4 100644
--- a/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte
+++ b/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte
@@ -208,7 +208,10 @@
                 hoverable
               >
                 <Icon
-                  on:click={() => removeUserFromGroup(user._id)}
+                  on:click={e => {
+                    removeUserFromGroup(user._id)
+                    e.stopPropagation()
+                  }}
                   hoverable
                   size="S"
                   name="Close"