diff --git a/apps/login/cypress/integration/verify.cy.ts b/apps/login/cypress/integration/verify.cy.ts
index d257022107c..a26d8b51e2b 100644
--- a/apps/login/cypress/integration/verify.cy.ts
+++ b/apps/login/cypress/integration/verify.cy.ts
@@ -14,6 +14,6 @@ describe("/verify", () => {
     // TODO: Avoid uncaught exception in application
     cy.once("uncaught:exception", () => false);
     cy.visit("/verify?userId=123&code=abc&submit=true");
-    cy.contains("The provided code is invalid.");
+    cy.contains("Could not verify email");
   });
 });
diff --git a/apps/login/src/ui/VerifyEmailForm.tsx b/apps/login/src/ui/VerifyEmailForm.tsx
index 50d13359ad0..d0bda03c1b2 100644
--- a/apps/login/src/ui/VerifyEmailForm.tsx
+++ b/apps/login/src/ui/VerifyEmailForm.tsx
@@ -71,13 +71,14 @@ export default function VerifyEmailForm({
       userId,
     }).catch((error: Error) => {
       setLoading(false);
-      setError("The provided code is invalid.");
+      setError(error.message);
     });
 
     setLoading(false);
 
     if (!verifyResponse) {
       setError("Could not verify email");
+      return;
     }
 
     const params = new URLSearchParams({});