diff --git a/packages/builder/src/analytics/IntercomClient.js b/packages/builder/src/analytics/IntercomClient.js
index e7a8539267..1c98b479cc 100644
--- a/packages/builder/src/analytics/IntercomClient.js
+++ b/packages/builder/src/analytics/IntercomClient.js
@@ -52,13 +52,13 @@ export default class IntercomClient {
    * @param {Object} user - user to identify
    * @returns Intercom global object
    */
-  show(user = {}) {
-    if (this.initialised && user?.admin && user?.cloud) {
-      return window.Intercom("boot", {
-        app_id: this.token,
-        ...user,
-      })
-    }
+  show(user = {}, enabled) {
+    if (!this.initialised || !enabled) return
+
+    return window.Intercom("boot", {
+      app_id: this.token,
+      ...user,
+    })
   }
 
   /**
diff --git a/packages/builder/src/stores/portal/auth.js b/packages/builder/src/stores/portal/auth.js
index 636e80de99..d6f4fc140f 100644
--- a/packages/builder/src/stores/portal/auth.js
+++ b/packages/builder/src/stores/portal/auth.js
@@ -54,23 +54,24 @@ export function createAuthStore() {
     })
 
     if (user) {
-      const adminStore = get(admin)
       analytics
         .activate()
         .then(() => {
           analytics.identify(user._id)
-          analytics.showChat({
-            email: user.email,
-            created_at: (user.createdAt || Date.now()) / 1000,
-            name: user.account?.name,
-            user_id: user._id,
-            tenant: user.tenantId,
-            admin: user?.admin?.global,
-            builder: user?.builder?.global,
-            "Company size": user.account?.size,
-            "Job role": user.account?.profession,
-            cloud: adminStore.cloud,
-          })
+          analytics.showChat(
+            {
+              email: user.email,
+              created_at: (user.createdAt || Date.now()) / 1000,
+              name: user.account?.name,
+              user_id: user._id,
+              tenant: user.tenantId,
+              admin: user?.admin?.global,
+              builder: user?.builder?.global,
+              "Company size": user.account?.size,
+              "Job role": user.account?.profession,
+            },
+            !!user?.account
+          )
         })
         .catch(() => {
           // This request may fail due to browser extensions blocking requests