diff --git a/client/.env.sample b/client/.env.sample
index f009725..a056b93 100644
--- a/client/.env.sample
+++ b/client/.env.sample
@@ -1 +1,3 @@
-VITE_BASE_URL = 
\ No newline at end of file
+
+VITE_BASE_URL = 
+
diff --git a/client/src/components/Login/Login.jsx b/client/src/components/Login/Login.jsx
index 59a15a8..26bbea5 100644
--- a/client/src/components/Login/Login.jsx
+++ b/client/src/components/Login/Login.jsx
@@ -31,6 +31,17 @@ const Login = () => {
   };
 
   const loginUser = async (data) => {
+    const tostStyle=  {
+              position: "top-center",
+              autoClose: 5000,
+              hideProgressBar: false,
+              closeOnClick: false,
+              pauseOnHover: false,
+              draggable: false,
+              progress: undefined,
+              theme: "light",
+              transition: Bounce,
+            };
     setLoading(true);
     axios
       .post(`${import.meta.env.VITE_BASE_URL}/user/login`, data)
@@ -42,70 +53,29 @@ const Login = () => {
           setloginError("");
           setTimeout(() => {
             navigate("/");
-          }, 1000);
-          toast.success("Logged in successfully!", {
-            position: "top-right",
-            autoClose: 5000,
-            hideProgressBar: false,
-            closeOnClick: false,
-            pauseOnHover: false,
-            draggable: false,
-            progress: undefined,
-            theme: "light",
-            transition: Bounce,
-          });
-        }
-      })
-      .catch((err) => {
-        if (err.response.data.message === "user not found") {
-          setloginError("User not found");
-          toast.warning("User not found!", {
-            position: "top-right",
-            autoClose: 5000,
-            hideProgressBar: false,
-            closeOnClick: false,
-            pauseOnHover: false,
-            draggable: false,
-            progress: undefined,
-            theme: "light",
-            transition: Bounce,
-          });
-          setLoading(false);
-        } else if (err.response.data.message === "Please verify email first") {
-          setloginError("Please verify email first");
-          localStorage.setItem("token", err.response.data.token);
-          setLoading(false);
-          navigate("/verifyotp");
-        } else if (err.response.data.message === "Invalid credentials") {
-          setloginError("Invalid Credentials");
-          toast.error("Invalid Credentials!", {
-            position: "top-right",
-            autoClose: 5000,
-            hideProgressBar: false,
-            closeOnClick: false,
-            pauseOnHover: false,
-            draggable: false,
-            progress: undefined,
-            theme: "light",
-            transition: Bounce,
-          });
-          setLoading(false);
-        } else {
-          setloginError("Something went wrong!");
-          toast.error("An error occurred!", {
-            position: "top-right",
-            autoClose: 5000,
-            hideProgressBar: false,
-            closeOnClick: false,
-            pauseOnHover: false,
-            draggable: false,
-            progress: undefined,
-            theme: "light",
-            transition: Bounce,
-          });
-          setLoading(false);
-        }
-      });
+
+          } else if (res.data.message === "user not found") {
+            setloginError("User not found");
+            toast.warning("User not found!",tostStyle);
+          } else if (res.data.message === "Invalid Credentials") {
+            setloginError("Invalid Credentials");
+            toast.error("Invalid credentials!",tostStyle);
+          } else if (res.data.message === "Unauthorized") {
+            setloginError("Invalid Credentials");
+            toast.error("Invalid credentials!",tostStyle);
+          } 
+          else {
+            setloginError("Something went wrong!");
+            toast.error("An error occurred!",tostStyle);
+          }
+        });
+      setLoading(false);
+    } catch (error) {
+      console.error(error);
+      setLoading(false);
+    }
+
+
   };
 
   if (loading) {
diff --git a/server/.env.sample b/server/.env.sample
index ca9f6ec..d90a865 100644
--- a/server/.env.sample
+++ b/server/.env.sample
@@ -1,6 +1,8 @@
 PORT = 
 MONGODB_URI = 
 SECRET = 
+
 ORIGIN = 
 APP_EMAIL = 
-APP_PASSWORD = 
\ No newline at end of file
+APP_PASSWORD = 
+