diff --git a/examples/react/src/routes.ts b/examples/react/src/routes.ts
index a83309acd..a4f56fe78 100644
--- a/examples/react/src/routes.ts
+++ b/examples/react/src/routes.ts
@@ -64,7 +64,7 @@ export const routes = [
   {
     name: "Forgot Password Screen",
     description: "A screen allowing a user to reset their password",
-    path: "/screens/forgot-password-screen",
+    path: "/screens/forgot-password-auth-screen",
     component: ForgotPasswordAuthScreenPage,
   },
   {
diff --git a/examples/react/src/screens/sign-in-auth-screen-w-handlers.tsx b/examples/react/src/screens/sign-in-auth-screen-w-handlers.tsx
index 4ad60e42d..c7e53b7e7 100644
--- a/examples/react/src/screens/sign-in-auth-screen-w-handlers.tsx
+++ b/examples/react/src/screens/sign-in-auth-screen-w-handlers.tsx
@@ -24,7 +24,7 @@ export default function SignInAuthScreenWithHandlersPage() {
   return (
     <SignInAuthScreen
       onForgotPasswordClick={() => {
-        navigate("/screen/forgot-password-auth-screen");
+        navigate("/screens/forgot-password-auth-screen");
       }}
       onSignUpClick={() => {
         navigate("/screens/sign-up-auth-screen");
diff --git a/packages/angular/src/lib/auth/forms/email-link-auth-form.ts b/packages/angular/src/lib/auth/forms/email-link-auth-form.ts
index 9ab4f60b6..6ce083940 100644
--- a/packages/angular/src/lib/auth/forms/email-link-auth-form.ts
+++ b/packages/angular/src/lib/auth/forms/email-link-auth-form.ts
@@ -96,7 +96,6 @@ export class EmailLinkAuthFormComponent {
       this.form.update({
         validators: {
           onBlur: this.formSchema(),
-          onSubmit: this.formSchema(),
           onSubmitAsync: async ({ value }) => {
             try {
               await sendSignInLinkToEmail(this.ui(), value.email);
diff --git a/packages/angular/src/lib/auth/forms/forgot-password-auth-form.ts b/packages/angular/src/lib/auth/forms/forgot-password-auth-form.ts
index f66226e93..5b2ad2210 100644
--- a/packages/angular/src/lib/auth/forms/forgot-password-auth-form.ts
+++ b/packages/angular/src/lib/auth/forms/forgot-password-auth-form.ts
@@ -104,7 +104,6 @@ export class ForgotPasswordAuthFormComponent {
       this.form.update({
         validators: {
           onBlur: this.formSchema(),
-          onSubmit: this.formSchema(),
           onSubmitAsync: async ({ value }) => {
             try {
               await sendPasswordResetEmail(this.ui(), value.email);
diff --git a/packages/angular/src/lib/auth/forms/mfa/totp-multi-factor-assertion-form.ts b/packages/angular/src/lib/auth/forms/mfa/totp-multi-factor-assertion-form.ts
index 307d8f530..e1f1b125a 100644
--- a/packages/angular/src/lib/auth/forms/mfa/totp-multi-factor-assertion-form.ts
+++ b/packages/angular/src/lib/auth/forms/mfa/totp-multi-factor-assertion-form.ts
@@ -78,7 +78,6 @@ export class TotpMultiFactorAssertionFormComponent {
       this.form.update({
         validators: {
           onBlur: this.formSchema(),
-          onSubmit: this.formSchema(),
           onSubmitAsync: async ({ value }) => {
             try {
               const assertion = TotpMultiFactorGenerator.assertionForSignIn(this.hint().uid, value.verificationCode);
diff --git a/packages/angular/src/lib/auth/forms/phone-auth-form.ts b/packages/angular/src/lib/auth/forms/phone-auth-form.ts
index 72b189c52..35ce2ff0a 100644
--- a/packages/angular/src/lib/auth/forms/phone-auth-form.ts
+++ b/packages/angular/src/lib/auth/forms/phone-auth-form.ts
@@ -101,7 +101,6 @@ export class PhoneNumberFormComponent {
       this.form.update({
         validators: {
           onBlur: this.formSchema(),
-          onSubmit: this.formSchema(),
           onSubmitAsync: async ({ value }) => {
             const selectedCountry = countryData.find((c) => c.code === this.country());
             const formattedNumber = formatPhoneNumber(value.phoneNumber, selectedCountry!);
@@ -207,7 +206,6 @@ export class VerificationFormComponent {
       this.form.update({
         validators: {
           onBlur: this.formSchema(),
-          onSubmit: this.formSchema(),
           onSubmitAsync: async ({ value }) => {
             try {
               const credential = await confirmPhoneNumber(this.ui(), this.verificationId(), value.verificationCode);
diff --git a/packages/angular/src/lib/auth/forms/sign-in-auth-form.ts b/packages/angular/src/lib/auth/forms/sign-in-auth-form.ts
index b2e6bb9ea..bc1c07573 100644
--- a/packages/angular/src/lib/auth/forms/sign-in-auth-form.ts
+++ b/packages/angular/src/lib/auth/forms/sign-in-auth-form.ts
@@ -118,9 +118,7 @@ export class SignInAuthFormComponent {
     effect(() => {
       this.form.update({
         validators: {
-          onChange: this.formSchema(),
           onBlur: this.formSchema(),
-          onSubmit: this.formSchema(),
           onSubmitAsync: async ({ value }) => {
             try {
               const credential = await signInWithEmailAndPassword(this.ui(), value.email, value.password);
diff --git a/packages/angular/src/lib/auth/forms/sign-up-auth-form.ts b/packages/angular/src/lib/auth/forms/sign-up-auth-form.ts
index fba5b9ee0..5466ae889 100644
--- a/packages/angular/src/lib/auth/forms/sign-up-auth-form.ts
+++ b/packages/angular/src/lib/auth/forms/sign-up-auth-form.ts
@@ -120,7 +120,6 @@ export class SignUpAuthFormComponent {
       this.form.update({
         validators: {
           onBlur: this.formSchema(),
-          onSubmit: this.formSchema(),
           onSubmitAsync: async ({ value }) => {
             try {
               const credential = await createUserWithEmailAndPassword(
diff --git a/packages/react/src/auth/forms/email-link-auth-form.tsx b/packages/react/src/auth/forms/email-link-auth-form.tsx
index 95e145aaf..ac6055ce7 100644
--- a/packages/react/src/auth/forms/email-link-auth-form.tsx
+++ b/packages/react/src/auth/forms/email-link-auth-form.tsx
@@ -58,7 +58,6 @@ export function useEmailLinkAuthForm(onSuccess?: EmailLinkAuthFormProps["onEmail
     },
     validators: {
       onBlur: schema,
-      onSubmit: schema,
       onSubmitAsync: async ({ value }) => {
         try {
           await action(value);
diff --git a/packages/react/src/auth/forms/forgot-password-auth-form.tsx b/packages/react/src/auth/forms/forgot-password-auth-form.tsx
index 67e30623f..95dcb61f6 100644
--- a/packages/react/src/auth/forms/forgot-password-auth-form.tsx
+++ b/packages/react/src/auth/forms/forgot-password-auth-form.tsx
@@ -57,7 +57,6 @@ export function useForgotPasswordAuthForm(onSuccess?: ForgotPasswordAuthFormProp
     },
     validators: {
       onBlur: schema,
-      onSubmit: schema,
       onSubmitAsync: async ({ value }) => {
         try {
           await action(value);
diff --git a/packages/react/src/auth/forms/mfa/sms-multi-factor-assertion-form.tsx b/packages/react/src/auth/forms/mfa/sms-multi-factor-assertion-form.tsx
index a29bdc9ce..dd5cf2c99 100644
--- a/packages/react/src/auth/forms/mfa/sms-multi-factor-assertion-form.tsx
+++ b/packages/react/src/auth/forms/mfa/sms-multi-factor-assertion-form.tsx
@@ -51,7 +51,6 @@ export function useSmsMultiFactorAssertionPhoneForm({
     },
     validators: {
       onBlur: schema,
-      onSubmit: schema,
       onSubmitAsync: async () => {
         try {
           const verificationId = await action({ hint, recaptchaVerifier });
@@ -144,7 +143,6 @@ export function useSmsMultiFactorAssertionVerifyForm({
       verificationCode: "",
     },
     validators: {
-      onSubmit: schema,
       onBlur: schema,
       onSubmitAsync: async ({ value }) => {
         try {
diff --git a/packages/react/src/auth/forms/mfa/sms-multi-factor-enrollment-form.tsx b/packages/react/src/auth/forms/mfa/sms-multi-factor-enrollment-form.tsx
index 84f0d2db5..dbab06843 100644
--- a/packages/react/src/auth/forms/mfa/sms-multi-factor-enrollment-form.tsx
+++ b/packages/react/src/auth/forms/mfa/sms-multi-factor-enrollment-form.tsx
@@ -49,7 +49,6 @@ export function useSmsMultiFactorEnrollmentPhoneNumberForm({
     },
     validators: {
       onBlur: schema,
-      onSubmit: schema,
       onSubmitAsync: async ({ value }) => {
         try {
           const formatted = formatPhoneNumber ? formatPhoneNumber(value.phoneNumber) : value.phoneNumber;
@@ -156,7 +155,6 @@ export function useMultiFactorEnrollmentVerifyPhoneNumberForm({
       verificationCode: "",
     },
     validators: {
-      onSubmit: schema,
       onBlur: schema,
       onSubmitAsync: async ({ value }) => {
         try {
diff --git a/packages/react/src/auth/forms/mfa/totp-multi-factor-assertion-form.tsx b/packages/react/src/auth/forms/mfa/totp-multi-factor-assertion-form.tsx
index 4a4e902c8..bb6caeb41 100644
--- a/packages/react/src/auth/forms/mfa/totp-multi-factor-assertion-form.tsx
+++ b/packages/react/src/auth/forms/mfa/totp-multi-factor-assertion-form.tsx
@@ -30,7 +30,6 @@ export function useTotpMultiFactorAssertionForm({ hint, onSuccess }: UseTotpMult
       verificationCode: "",
     },
     validators: {
-      onSubmit: schema,
       onBlur: schema,
       onSubmitAsync: async ({ value }) => {
         try {
diff --git a/packages/react/src/auth/forms/mfa/totp-multi-factor-enrollment-form.tsx b/packages/react/src/auth/forms/mfa/totp-multi-factor-enrollment-form.tsx
index fcbc6534f..a031470b4 100644
--- a/packages/react/src/auth/forms/mfa/totp-multi-factor-enrollment-form.tsx
+++ b/packages/react/src/auth/forms/mfa/totp-multi-factor-enrollment-form.tsx
@@ -32,7 +32,6 @@ export function useTotpMultiFactorSecretGenerationForm({ onSuccess }: UseTotpMul
     },
     validators: {
       onBlur: schema,
-      onSubmit: schema,
       onSubmitAsync: async ({ value }) => {
         try {
           const secret = await action();
@@ -117,7 +116,6 @@ export function useMultiFactorEnrollmentVerifyTotpForm({
       verificationCode: "",
     },
     validators: {
-      onSubmit: schema,
       onBlur: schema,
       onSubmitAsync: async ({ value }) => {
         try {
diff --git a/packages/react/src/auth/forms/phone-auth-form.tsx b/packages/react/src/auth/forms/phone-auth-form.tsx
index 40d5146d0..a030aad4c 100644
--- a/packages/react/src/auth/forms/phone-auth-form.tsx
+++ b/packages/react/src/auth/forms/phone-auth-form.tsx
@@ -57,7 +57,6 @@ export function usePhoneNumberForm({ recaptchaVerifier, onSuccess, formatPhoneNu
     },
     validators: {
       onBlur: schema,
-      onSubmit: schema,
       onSubmitAsync: async ({ value }) => {
         try {
           const formatted = formatPhoneNumber ? formatPhoneNumber(value.phoneNumber) : value.phoneNumber;
@@ -146,7 +145,6 @@ export function useVerifyPhoneNumberForm({ verificationId, onSuccess }: UseVerif
       verificationCode: "",
     },
     validators: {
-      onSubmit: schema,
       onBlur: schema,
       onSubmitAsync: async ({ value }) => {
         try {
diff --git a/packages/react/src/auth/forms/sign-in-auth-form.tsx b/packages/react/src/auth/forms/sign-in-auth-form.tsx
index 91be199a9..c5f3a74ad 100644
--- a/packages/react/src/auth/forms/sign-in-auth-form.tsx
+++ b/packages/react/src/auth/forms/sign-in-auth-form.tsx
@@ -60,7 +60,6 @@ export function useSignInAuthForm(onSuccess?: SignInAuthFormProps["onSignIn"]) {
     },
     validators: {
       onBlur: schema,
-      onSubmit: schema,
       onSubmitAsync: async ({ value }) => {
         try {
           const credential = await action(value);
diff --git a/packages/react/src/auth/forms/sign-up-auth-form.tsx b/packages/react/src/auth/forms/sign-up-auth-form.tsx
index 6210ce01e..f1b43f677 100644
--- a/packages/react/src/auth/forms/sign-up-auth-form.tsx
+++ b/packages/react/src/auth/forms/sign-up-auth-form.tsx
@@ -67,7 +67,6 @@ export function useSignUpAuthForm(onSuccess?: SignUpAuthFormProps["onSignUp"]) {
     } as z.infer<typeof schema>,
     validators: {
       onBlur: schema,
-      onSubmit: schema,
       onSubmitAsync: async ({ value }) => {
         try {
           const credential = await action(value);