diff --git a/plugins/guest-resources/src/connect.ts b/plugins/guest-resources/src/connect.ts
index 41f670cb7f..5ed3b41978 100644
--- a/plugins/guest-resources/src/connect.ts
+++ b/plugins/guest-resources/src/connect.ts
@@ -113,11 +113,11 @@ export async function connect (title: string): Promise<Client | undefined> {
   )
   console.log('logging in as guest')
   Analytics.handleEvent('GUEST LOGIN')
-  Analytics.setTag('workspace', ws)
+  Analytics.setWorkspace(ws)
   const me = await _client?.getAccount()
   if (me !== undefined) {
     Analytics.setUser(me.email)
-    Analytics.setTag('workspace', ws)
+    Analytics.setWorkspace(ws)
     console.log('login: employee account', me)
     setCurrentAccount(me)
   }
diff --git a/plugins/login-resources/src/utils.ts b/plugins/login-resources/src/utils.ts
index 07ff0537fe..8dc943c115 100644
--- a/plugins/login-resources/src/utils.ts
+++ b/plugins/login-resources/src/utils.ts
@@ -179,7 +179,7 @@ export async function createWorkspace (
     const result = await response.json()
     if (result.error == null) {
       Analytics.handleEvent('create workspace')
-      Analytics.setTag('workspace', workspaceName)
+      Analytics.setWorkspace(workspaceName)
     } else {
       await handleStatusError('Create workspace error', result.error)
     }
@@ -337,7 +337,7 @@ export async function selectWorkspace (workspace: string): Promise<[Status, Work
     const result = await response.json()
     if (result.error == null) {
       Analytics.handleEvent('Select workspace')
-      Analytics.setTag('workspace', workspace)
+      Analytics.setWorkspace(workspace)
     } else {
       await handleStatusError('Select workspace error', result.error)
     }
@@ -386,7 +386,7 @@ export async function fetchWorkspace (workspace: string): Promise<[Status, Works
     const result = await response.json()
     if (result.error == null) {
       Analytics.handleEvent('Fetch workspace')
-      Analytics.setTag('workspace', workspace)
+      Analytics.setWorkspace(workspace)
     } else {
       await handleStatusError('Fetch workspace error', result.error)
     }
@@ -433,7 +433,7 @@ export async function createMissingEmployee (workspace: string): Promise<[Status
     const result = await response.json()
     if (result.error == null) {
       Analytics.handleEvent('Create missing employee')
-      Analytics.setTag('workspace', workspace)
+      Analytics.setWorkspace(workspace)
     } else {
       await handleStatusError('Fetch workspace error', result.error)
     }