diff --git a/src/components/login/LoginSignup.css b/src/components/login/LoginSignup.css
index 0f92cae..117834e 100644
--- a/src/components/login/LoginSignup.css
+++ b/src/components/login/LoginSignup.css
@@ -154,9 +154,10 @@
 
 .error-message {
     color: red;
-    font-size: 12px;
+    font-size: 14px;
     margin-top: 5px;
+    text-align: start;
   }
   
 
-}
+
diff --git a/src/components/login/LoginSignup.jsx b/src/components/login/LoginSignup.jsx
index 6daadd6..ab529b6 100644
--- a/src/components/login/LoginSignup.jsx
+++ b/src/components/login/LoginSignup.jsx
@@ -2,25 +2,60 @@ import React, { useState } from "react";
 import { Link } from "react-router-dom"; // Import Link
 import { FaArrowLeft } from "react-icons/fa"; // Import Font Awesome arrow left icon
 import "./LoginSignup.css";
-import {FaEye,FaEyeSlash} from 'react-icons/fa6'
+import { FaEye, FaEyeSlash } from 'react-icons/fa6'
 const LoginSignup = () => {
 
-const [state, setState] = useState("Sign Up");
-const [isVisible, setIsVisible] = useState(false);
+  const [state, setState] = useState("Sign Up");
+  const [isVisible, setIsVisible] = useState(false);
 
   const [formData, setFormData] = useState({
     username: "",
     password: "",
     email: "",
   });
+
+  const [errors, setErrors] = useState({
+    username: "",
+    password: "",
+    email: "",
+  });
+
   const handleSignInWithGoogle = () => {
     window.location.href = 'http://localhost:4000/auth/google'; // Redirect to the server route for Google OAuth login
   };
 
   const ChangeHandler = (e) => {
     setFormData({ ...formData, [e.target.name]: e.target.value });
+    setErrors({ ...errors, [e.target.name]: "" });
+  };
+
+  const validate = () => {
+    let isValid = true;
+    const newErrors = {
+      username: "",
+      password: "",
+      email: "",
+    };
+
+    if (state === "Sign Up" && !formData.username) {
+      newErrors.username = "Please enter your name.";
+      isValid = false;
+    }
+    if (!formData.email) {
+      newErrors.email = "Please enter your email.";
+      isValid = false;
+    }
+    if (!formData.password) {
+      newErrors.password = "Please enter your password.";
+      isValid = false;
+    }
+
+    setErrors(newErrors);
+    return isValid;
   };
+
   const login = async () => {
+    if (!validate()) return;
     console.log("login");
     let responseData;
     await fetch("http://localhost:4000/login", {
@@ -40,6 +75,7 @@ const [isVisible, setIsVisible] = useState(false);
     }
   };
   const signup = async () => {
+    if (!validate()) return;
     console.log("Sign up");
     let responseData;
     await fetch("http://localhost:4000/signup", {
@@ -49,71 +85,63 @@ const [isVisible, setIsVisible] = useState(false);
         'content-Type': 'application/json'
       },
       body: JSON.stringify(formData)
-    }).then((response) => response.json()).then((data) => responseData = data)
+    }).then((response) => response.json()).then((data) => responseData = data);
     if (responseData.success) {
       localStorage.setItem('auth-token', responseData.token);
-      window.location.replace("/")
-    }
-    else {
+      window.location.replace("/");
+    } else {
       alert(responseData.errors);
     }
   };
-
   return (
     <div className="loginsignup">
 
-<Link to="/" className="back-icon" style={{ position: 'absolute', top: '15px', left: '35px', fontSize: '42px' }}>
-        <svg 
-          xmlns="http://www.w3.org/2000/svg" 
-          width="42" 
-          height="42" 
-          fill="currentColor" 
-          viewBox="0 0 16 16" 
-          style={{ 
+      <Link to="/" className="back-icon" style={{ position: 'absolute', top: '15px', left: '35px', fontSize: '42px' }}>
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          width="42"
+          height="42"
+          fill="currentColor"
+          viewBox="0 0 16 16"
+          style={{
             fontWeight: 'bold',
-            position: 'fixed', 
-            top: 20, 
+            position: 'fixed',
+            top: 20,
             left: 20
           }}
         >
-          <path 
-            fillRule="evenodd" 
+          <path
+            fillRule="evenodd"
             d="M1 8a7 7 0 1 0 14 0A7 7 0 0 0 1 8m15 0A8 8 0 1 1 0 8a8 8 0 0 1 16 0m-4.5-.5a.5.5 0 0 1 0 1H5.707l2.147 2.146a.5.5 0 0 1-.708.708l-3-3a.5.5 0 0 1 0-.708l3-3a.5.5 0 1 1 .708.708L5.707 7.5z"
           />
         </svg>
       </Link>
-      
-      <div className="loginsignup-cointainer">
-     
- 
 
+      <div className="loginsignup-cointainer">
         <h1>{state}</h1>
         <div className="loginsignup-fields">
           {state === "Sign Up" ? (
-            <input type="text" name="username" value={formData.username} onChange={ChangeHandler} placeholder="Your Name" />
             <>
               <p className="label-login">Name</p>
-              <input type="text" name="username" value={formData.username} onChange={ChangeHandler} placeholder="Your Name" /></>
+              <input type="text" name="username" value={formData.username} onChange={ChangeHandler} placeholder="Your Name" />              {errors.username && <div className="error-message">{errors.username}</div>}</>
           ) : (
             <></>
           )}
+          <p className="label-login">Email</p>
           <input type="email" name="email" value={formData.email} onChange={ChangeHandler} placeholder="Email Address" />
-          <input type="password" name="password" value={formData.password} onChange={ChangeHandler} placeholder="Password" />
-        </div>
-
+          {errors.email && <div className="error-message ">{errors.email}</div>}
           <p className="label-login">Password</p>
-          <input type={`${isVisible?"text":"password"}`} name="password" value={formData.password} onChange={ChangeHandler} placeholder="Password" />
-          {isVisible?<FaEye color="white" className={`${state=='Sign Up'?"eye1":"eye"}`} onClick={()=>setIsVisible(false)} />:<FaEyeSlash className={`${state=='Sign Up'?"eye1":"eye"}`} color="white" onClick={()=>setIsVisible(true)}/>}
-          </div>
+          <input type={`${isVisible ? "text" : "password"}`} name="password" value={formData.password} onChange={ChangeHandler} placeholder="Password" />          {errors.password && <div className="error-message">{errors.password}</div>}
+          {isVisible ? <FaEye color="white" className={`${state == 'Sign Up' ? "eye1" : "eye"}`} onClick={() => setIsVisible(false)} /> : <FaEyeSlash className={`${state == 'Sign Up' ? "eye1" : "eye"}`} color="white" onClick={() => setIsVisible(true)} />}
+        </div>
         <button
           onClick={() => {
             state === "Login" ? login() : signup();
           }}
         >
-          Continue
-        
-          
-         {state === "Login" ? "Login" : "Sign Up"}
+
+
+          {state === "Login" ? "Login" : "Sign Up"}
         </button>
         {state === "Sign Up" ? (
           <p className="loginsignup-login">
@@ -123,7 +151,7 @@ const [isVisible, setIsVisible] = useState(false);
                 setState("Login");
               }}
             >
-              Login Here
+              SignIn
             </span>
           </p>
         ) : (
@@ -134,7 +162,6 @@ const [isVisible, setIsVisible] = useState(false);
                 setState("Sign Up");
               }}
             >
-              Click Here
               Sign Up
             </span>
           </p>