diff --git a/src/components/login/SendToken.jsx b/src/components/login/SendToken.jsx
index 517a5db..2a2f287 100644
--- a/src/components/login/SendToken.jsx
+++ b/src/components/login/SendToken.jsx
@@ -12,6 +12,7 @@ import {useTranslations} from "next-intl";
 import * as Yup from "yup";
 import SvgLogin from "@/core/components/svgs/SvgLogin";
 import useRequest from "@/lib/app/hooks/useRequest";
+import AutoSubmit from "@/core/components/AutoSubmit";
 
 const SendTokenComponent = ({
                                 PhoneNumber,
@@ -111,6 +112,7 @@ const SendTokenComponent = ({
                                                         : null
                                                 }
                                             />
+                                            <AutoSubmit/>
                                             <Grid container>
                                                 <Grid item xs={12}>
                                                     <Button
diff --git a/src/components/register/navy/index.jsx b/src/components/register/navy/index.jsx
index ca458c6..9296f78 100644
--- a/src/components/register/navy/index.jsx
+++ b/src/components/register/navy/index.jsx
@@ -11,7 +11,7 @@ const NavyComponent = () => {
     const [timer, setTimer] = useState(initialTimerValue);
     // End For Resend Token
 
-    if (otpToken) {
+    if (!otpToken) {
         return (
             <RequestOtpComponent
                 setOtpToken={setOtpToken}
diff --git a/src/core/components/AutoSubmit.jsx b/src/core/components/AutoSubmit.jsx
index 6f0af03..9dddfca 100644
--- a/src/core/components/AutoSubmit.jsx
+++ b/src/core/components/AutoSubmit.jsx
@@ -4,7 +4,7 @@ import {useEffect} from "react";
 const AutoSubmit = () => {
     const {values, submitForm} = useFormikContext()
     useEffect(() => {
-        if (values.verification_code.toString().length === 6) {
+        if (values.verification_code.length === 6) {
             submitForm();
         }
     }, [values, submitForm]);