diff --git a/dev/prod/.env b/dev/prod/.env
index 15eafa18bdd..ff49722415b 100644
--- a/dev/prod/.env
+++ b/dev/prod/.env
@@ -9,5 +9,5 @@ COLLABORATOR_URL=ws://locahost:3078
 PRINT_URL=http://localhost:4005
 SIGN_URL=http://localhost:4006
 
-ANALYTICS_COLLECTOR_URL=http://localhost:4007
+ANALYTICS_COLLECTOR_URL=http://huly.local:4017
 AI_URL=http://localhost:4010
diff --git a/packages/analytics-providers/src/analyticsCollector.ts b/packages/analytics-providers/src/analyticsCollector.ts
index 02103e54be2..fb3e69b2e04 100644
--- a/packages/analytics-providers/src/analyticsCollector.ts
+++ b/packages/analytics-providers/src/analyticsCollector.ts
@@ -214,7 +214,8 @@ export class AnalyticsCollectorProvider implements AnalyticProvider {
     )
   }
 
-  setWorkspace (ws: string): void {
+  setWorkspace (ws: string, guest: boolean): void {
+    const prop: string = guest ? 'visited-workspace' : 'workspace'
     this.addEvent(
       AnalyticEventType.SetGroup,
       {
@@ -224,8 +225,8 @@ export class AnalyticsCollectorProvider implements AnalyticProvider {
           name: ws,
           joined_at: new Date().toISOString()
         },
-        $group_type: 'workspace',
-        $groups: { workspace: ws }
+        $group_type: prop,
+        $groups: { [prop]: ws }
       },
       '$groupidentify'
     )
diff --git a/packages/analytics-providers/src/posthog.ts b/packages/analytics-providers/src/posthog.ts
index 47a9cec8471..a15614f216e 100644
--- a/packages/analytics-providers/src/posthog.ts
+++ b/packages/analytics-providers/src/posthog.ts
@@ -44,11 +44,10 @@ export class PosthogAnalyticProvider implements AnalyticProvider {
     posthog.setPersonProperties({ [key]: value })
   }
 
-  setWorkspace (ws: string): void {
-    this.setTag('workspace', ws)
-    posthog.group('workspace', ws, {
-      name: `${ws}`
-    })
+  setWorkspace (ws: string, guest: boolean): void {
+    const prop: string = guest ? 'visited-workspace' : 'workspace'
+    this.setTag(prop, ws)
+    if (!guest) posthog.group(prop, ws, { name: `${ws}` })
   }
 
   logout (): void {
diff --git a/packages/analytics-providers/src/sentry.ts b/packages/analytics-providers/src/sentry.ts
index c98c6d48a77..22b7ba33216 100644
--- a/packages/analytics-providers/src/sentry.ts
+++ b/packages/analytics-providers/src/sentry.ts
@@ -59,8 +59,9 @@ export class SentryAnalyticProvider implements AnalyticProvider {
     Sentry.setTag(key, value)
   }
 
-  setWorkspace (ws: string): void {
-    this.setTag('workspace', ws)
+  setWorkspace (ws: string, guest: boolean): void {
+    const prop: string = guest ? 'visited-workspace' : 'workspace'
+    this.setTag(prop, ws)
   }
 
   handleEvent (event: string): void {
diff --git a/packages/analytics-providers/src/utils.ts b/packages/analytics-providers/src/utils.ts
index 0188d303ea1..fc81309eb4b 100644
--- a/packages/analytics-providers/src/utils.ts
+++ b/packages/analytics-providers/src/utils.ts
@@ -16,10 +16,21 @@
 import { UAParser } from 'ua-parser-js'
 import { getMetadata } from '@hcengineering/platform'
 import presentation from '@hcengineering/presentation'
-import { desktopPlatform } from '@hcengineering/ui'
+import { desktopPlatform, getCurrentLocation } from '@hcengineering/ui'
+import { Analytics } from '@hcengineering/analytics'
 
 const parser = UAParser()
 
+let _isSignUp: boolean = false
+export const signupStore = {
+  setSignUpFlow: (isSignUp: boolean) => {
+    _isSignUp = isSignUp
+  },
+  getSignUpFlow: () => {
+    return _isSignUp
+  }
+}
+
 function getUrlTrackingParams (): Record<string, string | null> {
   const params = new URLSearchParams(window.location.search)
   return {
@@ -102,3 +113,43 @@ export function collectEventMetadata (properties: Record<string, any> = {}): Rec
     ...trackingParams
   }
 }
+
+function getProviderFromUrl (): string | null {
+  const location = getCurrentLocation()
+  const referrer = document.referrer
+
+  if (referrer !== '') {
+    try {
+      const referrerUrl = new URL(referrer)
+      const hostname = referrerUrl.hostname
+
+      if (hostname === 'accounts.google.com') {
+        return 'google'
+      } else if (hostname === 'github.com') {
+        return 'github'
+      }
+    } catch (error) {
+      // Invalid URL, ignored
+    }
+  }
+
+  if (location.query?.provider != null && location.query.provider !== '') {
+    return location.query.provider
+  }
+
+  return null
+}
+
+export function trackOAuthCompletion (result: any): void {
+  const provider = getProviderFromUrl()
+  if (provider == null) return
+
+  const isSignUp = signupStore.getSignUpFlow()
+  const success = result != null
+
+  const eventPrefix = isSignUp ? 'signup' : 'login'
+  const eventSuffix = success ? 'completed' : 'error'
+  const eventName: string = `${eventPrefix}.${provider}.${eventSuffix}`
+
+  Analytics.handleEvent(eventName)
+}
diff --git a/packages/analytics-service/src/sentry.ts b/packages/analytics-service/src/sentry.ts
index ad3196fcf77..40446e79849 100644
--- a/packages/analytics-service/src/sentry.ts
+++ b/packages/analytics-service/src/sentry.ts
@@ -37,8 +37,9 @@ export class SentryAnalyticProvider implements AnalyticProvider {
     Sentry.setTag(key, value)
   }
 
-  setWorkspace (ws: string): void {
-    this.setTag('workspace', ws)
+  setWorkspace (ws: string, guest: boolean): void {
+    const prop: string = guest ? 'visited-workspace' : 'workspace'
+    this.setTag(prop, ws)
   }
 
   handleEvent (event: string): void {
diff --git a/packages/analytics/src/index.ts b/packages/analytics/src/index.ts
index db90fdbec38..31f28b4a025 100644
--- a/packages/analytics/src/index.ts
+++ b/packages/analytics/src/index.ts
@@ -10,7 +10,7 @@ export interface AnalyticProvider {
   setUser: (email: string, data: any) => void
   setAlias: (distinctId: string, alias: string) => void
   setTag: (key: string, value: string) => void
-  setWorkspace: (ws: string) => void
+  setWorkspace: (ws: string, guest: boolean) => void
   handleEvent: (event: string, params: Record<string, string>) => void
   handleError: (error: Error) => void
   navigate: (path: string) => void
@@ -45,9 +45,9 @@ export const Analytics = {
     })
   },
 
-  setWorkspace (ws: string): void {
+  setWorkspace (ws: string, guest: boolean): void {
     providers.forEach((provider) => {
-      provider.setWorkspace(ws)
+      provider.setWorkspace(ws, guest)
     })
   },
 
diff --git a/plugins/guest-resources/src/connect.ts b/plugins/guest-resources/src/connect.ts
index fc54ea3beb4..cb7e9789d95 100644
--- a/plugins/guest-resources/src/connect.ts
+++ b/plugins/guest-resources/src/connect.ts
@@ -178,8 +178,6 @@ export async function connect (title: string): Promise<Client | undefined> {
     }
   })
   console.log('logging in as guest')
-  Analytics.handleEvent('GUEST LOGIN')
-  // Analytics.setWorkspace(wsUrl)
 
   const account = workspaceLoginInfo.account
 
@@ -191,9 +189,16 @@ export async function connect (title: string): Promise<Client | undefined> {
     fullSocialIds: []
   }
 
+  const data: Record<string, any> = {
+    guest_uuid: account,
+    visited_workspace: wsUrl,
+    visited_workspace_uuid: workspaceLoginInfo.workspace
+  }
+  Analytics.handleEvent('GUEST LOGIN', data)
+
   if (me !== undefined) {
-    Analytics.setUser(account, { account })
-    Analytics.setWorkspace(wsUrl)
+    Analytics.setUser(data.guest_uuid, data)
+    Analytics.setWorkspace(wsUrl, true)
     console.log('login: employee account', me)
     setCurrentAccount(me)
     setCurrentEmployee('' as Ref<Employee>)
diff --git a/plugins/login-resources/package.json b/plugins/login-resources/package.json
index f29e2cefd34..e26b2ae527b 100644
--- a/plugins/login-resources/package.json
+++ b/plugins/login-resources/package.json
@@ -49,6 +49,7 @@
     "@hcengineering/setting": "^0.6.17",
     "@hcengineering/theme": "^0.6.5",
     "@hcengineering/analytics": "^0.6.0",
-    "@hcengineering/account-client": "^0.6.0"
+    "@hcengineering/account-client": "^0.6.0",
+    "@hcengineering/analytics-providers": "^0.6.0"
   }
 }
diff --git a/plugins/login-resources/src/analytics.ts b/plugins/login-resources/src/analytics.ts
index 8f5c12d6bb5..d259d6a93be 100644
--- a/plugins/login-resources/src/analytics.ts
+++ b/plugins/login-resources/src/analytics.ts
@@ -24,6 +24,10 @@ export const LoginEvents = {
   LoginGoogle: 'login.viaGoogle',
   LoginGithub: 'login.viaGitHub',
 
+  LoginGuestStarted: 'login.guest.started',
+  LoginGuestCompleted: 'login.guest.completed',
+  LoginGuestError: 'login.guest.error',
+
   CreateWorkspace: 'onboard.createWorkspace',
   SelectWorkspace: 'onboard.selectWorkspace'
 }
diff --git a/plugins/login-resources/src/components/Auth.svelte b/plugins/login-resources/src/components/Auth.svelte
index 8f23703c976..8323083ecd6 100644
--- a/plugins/login-resources/src/components/Auth.svelte
+++ b/plugins/login-resources/src/components/Auth.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import { Loading } from '@hcengineering/ui'
   import { logIn } from '@hcengineering/workbench'
+  import { trackOAuthCompletion } from '@hcengineering/analytics-providers'
   import { onMount } from 'svelte'
 
   import {
@@ -21,6 +22,8 @@
 
     const result = await getLoginInfoFromQuery()
 
+    trackOAuthCompletion(result)
+
     if (result != null) {
       await logIn(result)
 
diff --git a/plugins/login-resources/src/components/Join.svelte b/plugins/login-resources/src/components/Join.svelte
index 4b020eb2bda..e0fa32b59d3 100644
--- a/plugins/login-resources/src/components/Join.svelte
+++ b/plugins/login-resources/src/components/Join.svelte
@@ -20,16 +20,18 @@
   import Form from './Form.svelte'
 
   import { Analytics } from '@hcengineering/analytics'
+  import { signupStore } from '@hcengineering/analytics-providers'
   import { logIn, workbenchId } from '@hcengineering/workbench'
   import { onMount } from 'svelte'
-  import { BottomAction } from '..'
   import { loginAction, recoveryAction } from '../actions'
   import login from '../plugin'
 
   const location = getCurrentLocation()
-  Analytics.handleEvent('invite_link_activated')
+  Analytics.handleEvent('invite_link_activated', { invite_id: location.query?.inviteId })
   let page = 'signUp'
 
+  $: signupStore.setSignUpFlow(page === 'signUp')
+
   $: fields =
     page === 'login'
       ? [
diff --git a/plugins/login-resources/src/components/LoginForm.svelte b/plugins/login-resources/src/components/LoginForm.svelte
index 0f31cdc4cb7..ad56223eb53 100644
--- a/plugins/login-resources/src/components/LoginForm.svelte
+++ b/plugins/login-resources/src/components/LoginForm.svelte
@@ -15,6 +15,8 @@
 -->
 <script lang="ts">
   import { type IntlString, Severity, Status } from '@hcengineering/platform'
+  import { signupStore } from '@hcengineering/analytics-providers'
+  import { onMount } from 'svelte'
 
   import { type BottomAction, doLoginAsGuest, doLoginNavigate, LoginMethods } from '../index'
   import LoginPasswordForm from './LoginPasswordForm.svelte'
@@ -33,6 +35,10 @@
 
   let method: LoginMethods = useOTP ? LoginMethods.Otp : LoginMethods.Password
 
+  onMount(() => {
+    signupStore.setSignUpFlow(false)
+  })
+
   function changeMethod (event: CustomEvent<LoginMethods>): void {
     method = event.detail
   }
@@ -51,7 +57,7 @@
     }
   }
 
-  async function guestLogin () {
+  async function guestLogin (): Promise<void> {
     let status = new Status(Severity.INFO, login.status.ConnectingToServer, {})
     const [loginStatus, result] = await doLoginAsGuest()
     status = loginStatus
diff --git a/plugins/login-resources/src/components/Providers.svelte b/plugins/login-resources/src/components/Providers.svelte
index 16b8476b152..cf1e424cfee 100644
--- a/plugins/login-resources/src/components/Providers.svelte
+++ b/plugins/login-resources/src/components/Providers.svelte
@@ -3,6 +3,7 @@
   import { getMetadata } from '@hcengineering/platform'
   import { type ProviderInfo } from '@hcengineering/account-client'
   import { AnySvelteComponent, Button, Grid, deviceOptionsStore, getCurrentLocation } from '@hcengineering/ui'
+  import { Analytics } from '@hcengineering/analytics'
   import { onMount } from 'svelte'
   import login from '../plugin'
   import { getProviders } from '../utils'
@@ -60,13 +61,28 @@
 
     return concatLink(accountsUrl, path)
   }
+
+  function handleProviderClick (provider: Provider): void {
+    const currentPath = location.path[1]
+    const isSignUp = currentPath === 'signup'
+    const isJoin = currentPath === 'join'
+    const eventPrefix = isSignUp || isJoin ? 'signup' : 'login'
+    const eventName: string = `${eventPrefix}.${provider.name}.started`
+
+    Analytics.handleEvent(eventName)
+  }
 </script>
 
 {#if !$deviceOptionsStore.isMobile}
   <div class="container">
     <Grid column={getColumnsCount(enabledProviders.length)} columnGap={1} rowGap={1} alignItems={'center'}>
       {#each enabledProviders as provider}
-        <a href={getLink(provider)}>
+        <a
+          href={getLink(provider)}
+          on:click={() => {
+            handleProviderClick(provider)
+          }}
+        >
           <Button kind={'contrast'} shape={'round2'} size={'x-large'} width="100%" stopPropagation={false}>
             <svelte:fragment slot="content">
               <svelte:component this={provider.component} displayName={provider.displayName} />
diff --git a/plugins/login-resources/src/components/SignupForm.svelte b/plugins/login-resources/src/components/SignupForm.svelte
index 8056064990a..6c888b88c21 100644
--- a/plugins/login-resources/src/components/SignupForm.svelte
+++ b/plugins/login-resources/src/components/SignupForm.svelte
@@ -16,15 +16,17 @@
 <script lang="ts">
   import { OK, Severity, Status } from '@hcengineering/platform'
   import { logIn } from '@hcengineering/workbench'
+  import { signupStore } from '@hcengineering/analytics-providers'
 
   import BottomActionComponent from './BottomAction.svelte'
   import login from '../plugin'
   import { getPasswordValidationRules } from '../validations'
   import { goTo } from '../utils'
   import Form from './Form.svelte'
-  import { OtpLoginSteps, signUp, signUpOtp } from '../index'
+  import { OtpLoginSteps, signUp, signUpOtp, type BottomAction } from '../index'
   import type { Field } from '../types'
   import OtpForm from './OtpForm.svelte'
+  import { onMount } from 'svelte'
 
   export let signUpDisabled = false
   export let localLoginHidden = false
@@ -70,6 +72,10 @@
     goTo('login')
   }
 
+  onMount(() => {
+    signupStore.setSignUpFlow(true)
+  })
+
   const action = {
     i18n: login.string.SignUp,
     func: async () => {
diff --git a/plugins/login-resources/src/utils.ts b/plugins/login-resources/src/utils.ts
index e7d85baeee9..1964a3c237c 100644
--- a/plugins/login-resources/src/utils.ts
+++ b/plugins/login-resources/src/utils.ts
@@ -102,23 +102,23 @@ export async function doLogin (email: string, password: string): Promise<[Status
 
 export async function doLoginAsGuest (): Promise<[Status, LoginInfo | null]> {
   try {
+    Analytics.handleEvent(LoginEvents.LoginGuestStarted)
     const accountClient = getAccountClient(null)
 
     const loginInfo = await accountClient.loginAsGuest()
 
-    /* Analytics.handleEvent(LoginEvents.LoginPassword, { email, ok: true })
-    Analytics.setUser(email, loginInfo.account) */
+    Analytics.handleEvent(LoginEvents.LoginGuestCompleted)
 
     return [OK, loginInfo]
   } catch (err: any) {
     if (err instanceof PlatformError) {
-      // Analytics.handleEvent(LoginEvents.LoginPassword, { email, ok: false })
+      Analytics.handleEvent(LoginEvents.LoginGuestError)
       await handleStatusError('Login error', err.status)
 
       return [err.status, null]
     } else {
-      // Analytics.handleEvent(LoginEvents.LoginPassword, { email, ok: false })
-      // Analytics.handleError(err)
+      Analytics.handleEvent(LoginEvents.LoginGuestError)
+      Analytics.handleError(err)
 
       return [unknownError(err), null]
     }
@@ -188,7 +188,6 @@ export async function createWorkspace (
     const workspaceLoginInfo = await getAccountClient(token).createWorkspace(workspaceName, region)
 
     Analytics.handleEvent(LoginEvents.CreateWorkspace, { name: workspaceName, ok: true })
-    Analytics.setWorkspace(workspaceName)
 
     return [OK, workspaceLoginInfo]
   } catch (err: any) {
@@ -496,6 +495,10 @@ export function navigateToWorkspace (
   }
 
   setLoginInfo(loginInfo)
+  Analytics.handleEvent(LoginEvents.SelectWorkspace, {
+    workspace: workspaceUrl,
+    workspace_uuid: loginInfo.workspace
+  })
 
   if (navigateUrl != null) {
     try {
@@ -607,7 +610,7 @@ export async function getInviteLinkId (
 
   const inviteLink = await getAccountClient(token).createInvite(exp, emailMask, limit, role)
 
-  Analytics.handleEvent('Get invite link')
+  Analytics.handleEvent('Get invite link', { invite_id: inviteLink })
 
   return inviteLink
 }
diff --git a/plugins/workbench-resources/src/connect.ts b/plugins/workbench-resources/src/connect.ts
index 3564efa5c8e..7c87c63ffcd 100644
--- a/plugins/workbench-resources/src/connect.ts
+++ b/plugins/workbench-resources/src/connect.ts
@@ -16,7 +16,8 @@ import core, {
   setCurrentAccount,
   type SocialId,
   type Version,
-  versionToString
+  versionToString,
+  SocialIdType
 } from '@hcengineering/core'
 import login, { loginId, type Pages } from '@hcengineering/login'
 import platform, {
@@ -389,19 +390,34 @@ export async function connect (title: string): Promise<Client | undefined> {
     await setPlatformStatus(new Status(Severity.INFO, platform.status.SystemAccount, {}))
   }
 
-  const socialId = me.fullSocialIds.find((si) => si._id === me.primarySocialId)?.value
-  const email = me.fullSocialIds.find((si) => si.type === 'email')?.value ?? socialId
+  const hasEmail = (si: SocialId): boolean => {
+    return [SocialIdType.EMAIL, SocialIdType.GOOGLE, SocialIdType.GITHUB].some((type) => type === si.type)
+  }
+  const email = me.fullSocialIds.find((si) => hasEmail(si))?.key
+  const socialId = me.fullSocialIds.find((si) => si._id === me.primarySocialId)?.key
 
   const data: Record<string, any> = {
-    social_id: socialId ?? account,
+    social_id: email ?? socialId ?? account,
+    primary_social_id: socialId,
     account_uuid: account,
-    workspace: workspace.name,
-    workspace_uuid: workspace.uuid,
+    role: workspaceLoginInfo.role,
     branding: workspace.branding ?? 'unknown'
   }
 
-  Analytics.setUser(email ?? account, data)
-  Analytics.setWorkspace(workspace.name)
+  const guestRole =
+    workspaceLoginInfo.role === AccountRole.ReadOnlyGuest ||
+    workspaceLoginInfo.role === AccountRole.DocGuest ||
+    workspaceLoginInfo.role === AccountRole.Guest
+  if (guestRole) {
+    data.visited_workspace = workspace.url
+    data.visited_workspace_uuid = workspace.uuid
+  } else {
+    data.workspace = workspace.url
+    data.workspace_uuid = workspace.uuid
+  }
+
+  Analytics.setUser(data.social_id, data)
+  Analytics.setWorkspace(workspace.name, guestRole)
   Analytics.handleEvent(WorkbenchEvents.Connect)
   console.log('Logged in with account: ', me)
   setCurrentAccount(me)