diff --git a/apps/learn-card-app/src/pages/login/forms/EmailForm.tsx b/apps/learn-card-app/src/pages/login/forms/EmailForm.tsx
index 04be19913a..7e4a8f0c6e 100644
--- a/apps/learn-card-app/src/pages/login/forms/EmailForm.tsx
+++ b/apps/learn-card-app/src/pages/login/forms/EmailForm.tsx
@@ -68,8 +68,8 @@ const EmailForm: React.FC<EmailFormProps> = ({
 
     const enableMagicLinkLogin = flags?.enableMagicLinkLogin ?? false;
 
-    const shouldVerifyCode = query.get('verifyCode');
     const verificationEmail = redirectStore.get.email();
+    const shouldVerifyCode = Boolean(query.get('verifyCode') || verificationEmail);
 
     const [email, setEmail] = useState<string | null | undefined>('');
     const [code, setCode] = useState<string>('');
diff --git a/apps/scouts/src/pages/login/forms/EmailForm.tsx b/apps/scouts/src/pages/login/forms/EmailForm.tsx
index 8e7f55ae29..e351b5eb70 100644
--- a/apps/scouts/src/pages/login/forms/EmailForm.tsx
+++ b/apps/scouts/src/pages/login/forms/EmailForm.tsx
@@ -43,8 +43,8 @@ const EmailForm: React.FC = () => {
 
     const enableMagicLinkLogin = flags?.enableMagicLinkLogin ?? false;
 
-    const shouldVerifyCode = query.get('verifyCode');
     const verificationEmail = redirectStore.get.email();
+    const shouldVerifyCode = Boolean(query.get('verifyCode') || verificationEmail);
 
     const [email, setEmail] = useState<string | null | undefined>('');
     const [code, setCode] = useState<string>('');