diff --git a/web/components/account/auth-forms/unique-code.tsx b/web/components/account/auth-forms/unique-code.tsx
index e84422090..9a411c2ab 100644
--- a/web/components/account/auth-forms/unique-code.tsx
+++ b/web/components/account/auth-forms/unique-code.tsx
@@ -81,7 +81,7 @@ export const AuthUniqueCodeForm: React.FC<TAuthUniqueCodeForm> = (props) => {
         setIsSubmitting(true);
         captureEvent(CODE_VERIFIED, {
           state: "SUCCESS",
-          first_time: isExistingEmail,
+          first_time: !isExistingEmail,
         });
       }}
       onError={() => setIsSubmitting(false)}
diff --git a/web/components/onboarding/create-workspace.tsx b/web/components/onboarding/create-workspace.tsx
index d9db3cbd8..06c9dbcc9 100644
--- a/web/components/onboarding/create-workspace.tsx
+++ b/web/components/onboarding/create-workspace.tsx
@@ -66,7 +66,7 @@ export const CreateWorkspace: React.FC<Props> = (props) => {
               captureWorkspaceEvent({
                 eventName: WORKSPACE_CREATED,
                 payload: {
-                  workspace_id: res.id,
+                  ...res,
                   state: "SUCCESS",
                   first_time: true,
                   element: E_ONBOARDING,
diff --git a/web/components/onboarding/profile-setup.tsx b/web/components/onboarding/profile-setup.tsx
index 814efa26c..2b7ab034d 100644
--- a/web/components/onboarding/profile-setup.tsx
+++ b/web/components/onboarding/profile-setup.tsx
@@ -13,7 +13,7 @@ import { PasswordStrengthMeter } from "@/components/account";
 import { UserImageUploadModal } from "@/components/core";
 import { OnboardingHeader, SwitchAccountDropdown } from "@/components/onboarding";
 // constants
-import { E_ONBOARDING, USER_DETAILS, E_ONBOARDING_STEP_1,E_ONBOARDING_STEP_2 } from "@/constants/event-tracker";
+import { USER_DETAILS, E_ONBOARDING_STEP_1, E_ONBOARDING_STEP_2 } from "@/constants/event-tracker";
 // helpers
 import { getPasswordStrength } from "@/helpers/password.helper";
 // hooks