diff --git a/src/platform/onboarding/cloud/CloudLoginView.vue b/src/platform/onboarding/cloud/CloudLoginView.vue
index 1dec40019..f4da23f7d 100644
--- a/src/platform/onboarding/cloud/CloudLoginView.vue
+++ b/src/platform/onboarding/cloud/CloudLoginView.vue
@@ -104,7 +104,7 @@
 import Button from 'primevue/button'
 import Divider from 'primevue/divider'
 import Message from 'primevue/message'
-import { computed, onMounted, ref } from 'vue'
+import { computed, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useRoute, useRouter } from 'vue-router'
 
@@ -179,8 +179,4 @@ const signInWithEmail = async (values: SignInData) => {
     await onSuccess()
   }
 }
-
-onMounted(async () => {
-  await authActions.logout()
-})
 </script>
diff --git a/src/platform/onboarding/cloud/CloudSignupView.vue b/src/platform/onboarding/cloud/CloudSignupView.vue
index f1595b0f0..fb49dfcc4 100644
--- a/src/platform/onboarding/cloud/CloudSignupView.vue
+++ b/src/platform/onboarding/cloud/CloudSignupView.vue
@@ -117,7 +117,8 @@ const navigateToLogin = () => {
 }
 
 const onSuccess = async () => {
-  await router.push({ name: 'cloud-login', query: route.query })
+  // The invite code will be handled after the user is logged in
+  await router.push({ path: '/', query: route.query })
 }
 
 // Custom error handler for inline display
diff --git a/src/platform/onboarding/cloud/CloudVerifyEmailView.vue b/src/platform/onboarding/cloud/CloudVerifyEmailView.vue
index 2f9f94df0..d2a137c46 100644
--- a/src/platform/onboarding/cloud/CloudVerifyEmailView.vue
+++ b/src/platform/onboarding/cloud/CloudVerifyEmailView.vue
@@ -35,19 +35,54 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted } from 'vue'
+import { onMounted, onUnmounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useRoute, useRouter } from 'vue-router'
+import { useFirebaseAuth } from 'vuefire'
 
 import { useToastStore } from '@/platform/updates/common/toastStore'
 import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
 
 const authStore = useFirebaseAuthStore()
+const auth = useFirebaseAuth()!
 
 const router = useRouter()
 const route = useRoute()
 const { t } = useI18n()
 
+let intervalId: number | null = null
+let timeoutId: number | null = null
+const redirectInProgress = ref(false)
+
+function clearPolling(): void {
+  if (intervalId !== null) {
+    clearInterval(intervalId)
+    intervalId = null
+  }
+  if (timeoutId !== null) {
+    clearTimeout(timeoutId)
+    timeoutId = null
+  }
+}
+
+async function redirectToNextStep(): Promise<void> {
+  if (redirectInProgress.value) return
+
+  redirectInProgress.value = true
+  clearPolling()
+
+  const inviteCode = route.query.inviteCode as string | undefined
+
+  if (inviteCode) {
+    await router.push({
+      name: 'cloud-invite-check',
+      query: { inviteCode }
+    })
+  } else {
+    await router.push({ name: 'cloud-user-check' })
+  }
+}
+
 const goBack = async () => {
   const inviteCode = route.query.inviteCode as string | undefined
   const authStore = useFirebaseAuthStore()
@@ -86,23 +121,35 @@ async function onSend() {
 }
 
 onMounted(async () => {
-  // When this screen loads via invite flow,
-  // ensure the invite code stays in the URL for the next step.
-  const inviteCode = route.query.inviteCode as string | undefined
-
   // If the user is already verified (email link already clicked),
   // continue to the next step automatically.
   if (authStore.isEmailVerified) {
-    if (inviteCode) {
-      await router.push({
-        name: 'cloud-invite-check',
-        query: inviteCode ? { inviteCode } : {}
-      })
-    } else {
-      await router.push({ name: 'cloud-user-check' })
-    }
-  } else {
-    await onSend()
+    return redirectToNextStep()
   }
+
+  // Send initial verification email
+  await onSend()
+
+  // Start polling to check email verification status
+  intervalId = window.setInterval(async () => {
+    if (auth.currentUser && !redirectInProgress.value) {
+      await auth.currentUser.reload()
+      if (auth.currentUser?.emailVerified) {
+        void redirectToNextStep()
+      }
+    }
+  }, 5000) // Check every 5 seconds
+
+  // Stop polling after 5 minutes
+  timeoutId = window.setTimeout(
+    () => {
+      clearPolling()
+    },
+    5 * 60 * 1000
+  )
+})
+
+onUnmounted(() => {
+  clearPolling()
 })
 </script>