diff --git a/apps/web/app/api/v1/users/route.ts b/apps/web/app/api/v1/users/route.ts
index 55d61b0464..23522eda87 100644
--- a/apps/web/app/api/v1/users/route.ts
+++ b/apps/web/app/api/v1/users/route.ts
@@ -20,17 +20,13 @@ export async function POST(request: Request) {
   if (!EMAIL_AUTH_ENABLED || inviteToken ? INVITE_DISABLED : !SIGNUP_ENABLED) {
     return Response.json({ error: "Signup disabled" }, { status: 403 });
   }
-  user = { ...user, ...{ email: user.email.toLowerCase() } };
 
   let inviteId;
 
   try {
     let invite;
+    let isInviteValid = false;
 
-    // create the user
-    user = await createUser(user);
-
-    // User is invited to team
     if (inviteToken) {
       let inviteTokenData = await verifyInviteToken(inviteToken);
       inviteId = inviteTokenData?.inviteId;
@@ -45,7 +41,20 @@ export async function POST(request: Request) {
       if (!invite) {
         return Response.json({ error: "Invalid invite ID" }, { status: 400 });
       }
+      isInviteValid = true;
+    }
 
+    user = {
+      ...user,
+      ...{ email: user.email.toLowerCase() },
+      onboardingCompleted: isInviteValid,
+    };
+
+    // create the user
+    user = await createUser(user);
+
+    // User is invited to team
+    if (isInviteValid) {
       // assign user to existing team
       await createMembership(invite.teamId, user.id, {
         accepted: true,
diff --git a/apps/web/playwright/team.spec.ts b/apps/web/playwright/team.spec.ts
index ad4c62bafc..f84ce8a42d 100644
--- a/apps/web/playwright/team.spec.ts
+++ b/apps/web/playwright/team.spec.ts
@@ -86,7 +86,7 @@ test.describe("Invite, accept and remove team member", async () => {
     await page.getByRole("link", { name: "Create account" }).click();
 
     await signupUsingInviteToken(page, name, email, password);
-    await finishOnboarding(page, false);
+    await page.waitForURL(/\/environments\/[^/]+\/surveys/);
   });
 
   test("Remove member", async ({ page }) => {
diff --git a/packages/ui/SurveysList/index.tsx b/packages/ui/SurveysList/index.tsx
index 1c65014597..a52cecd7a5 100644
--- a/packages/ui/SurveysList/index.tsx
+++ b/packages/ui/SurveysList/index.tsx
@@ -173,7 +173,7 @@ export const SurveysList = ({
         <div className="flex h-full flex-col items-center justify-center">
           <span className="mb-4 h-24 w-24 rounded-full bg-slate-100 p-6 text-5xl">🕵️</span>
 
-          <div className="text-slate-600">{isFetching ? "Fetching Surveys" : "No surveys found"}</div>
+          <div className="text-slate-600">{isFetching ? "Fetching surveys..." : "No surveys found"}</div>
         </div>
       )}
     </div>