diff --git a/apps/web/app/(auth)/invite/page.tsx b/apps/web/app/(auth)/invite/page.tsx
index 9c707fb13e..3b4a91795c 100644
--- a/apps/web/app/(auth)/invite/page.tsx
+++ b/apps/web/app/(auth)/invite/page.tsx
@@ -6,6 +6,7 @@ import { sendInviteAcceptedEmail } from "@formbricks/lib/emails/emails";
 import { deleteInvite, getInvite } from "@formbricks/lib/invite/service";
 import { verifyInviteToken } from "@formbricks/lib/jwt";
 import { createMembership } from "@formbricks/lib/membership/service";
+import { updateUser } from "@formbricks/lib/user/service";
 
 import {
   ExpiredContent,
@@ -44,7 +45,7 @@ export default async function InvitePage({ searchParams }) {
       await deleteInvite(inviteId);
 
       sendInviteAcceptedEmail(invite.creator.name ?? "", session.user?.name ?? "", invite.creator.email);
-
+      updateUser(session.user.id, { onboardingCompleted: true });
       return <RightAccountContent />;
     }
   } catch (e) {
diff --git a/packages/lib/constants.ts b/packages/lib/constants.ts
index 8a66195a16..faf678dec5 100644
--- a/packages/lib/constants.ts
+++ b/packages/lib/constants.ts
@@ -81,7 +81,7 @@ export const TEXT_RESPONSES_PER_PAGE = 5;
 
 export const DEFAULT_TEAM_ID = env.DEFAULT_TEAM_ID;
 export const DEFAULT_TEAM_ROLE = env.DEFAULT_TEAM_ROLE;
-export const ONBOARDING_DISABLED = env.ONBOARDING_DISABLED;
+export const ONBOARDING_DISABLED = env.ONBOARDING_DISABLED === "1";
 
 // Storage constants
 export const AWS_ACCESS_KEY_ID = env.AWS_ACCESS_KEY_ID;
diff --git a/packages/lib/env.ts b/packages/lib/env.ts
index d987cff7bd..1f23b82f9f 100644
--- a/packages/lib/env.ts
+++ b/packages/lib/env.ts
@@ -51,7 +51,7 @@ export const env = createEnv({
     OIDC_ISSUER: z.string().optional(),
     OIDC_SIGNING_ALGORITHM: z.string().optional(),
     OPENTELEMETRY_LISTENER_URL: z.string().optional(),
-    ONBOARDING_DISABLED: z.string().optional(),
+    ONBOARDING_DISABLED: z.enum(["1", "0"]).optional(),
     PASSWORD_RESET_DISABLED: z.enum(["1", "0"]).optional(),
     PRIVACY_URL: z
       .string()