diff --git a/SignUp/signup.html b/SignUp/signup.html
index 723c3b67..8c99dd96 100644
--- a/SignUp/signup.html
+++ b/SignUp/signup.html
@@ -8,11 +8,11 @@
     <link rel="shortcut icon" href="../images/logo.png" type="image/x-icon">
     <style>
         .condition {
-            color: gray; /* Default color */
+            color: gray;
             font-size: 0.9em;
         }
         .condition.met {
-            color: lightgreen; /* Turns green when condition is met */
+            color: lightgreen;
         }
         .error-message {
             color: red;
@@ -29,35 +29,32 @@
 
     <div class="signup-container">
         <h1>Create Your Account</h1>
-        <form action="#" method="post">
+        <form id="signup-form" action="#" method="post">
             <div class="input-group">
                 <label for="username">Username</label>
                 <input type="text" id="username" name="username" placeholder="Create a Username" required>
             </div>
             <div class="input-group">
                 <label for="email">Email</label>
-                <div id="email-error" class="error-message"></div> <!-- Error message container -->
+                <div id="email-error" class="error-message"></div>
                 <input type="email" id="email" name="email" placeholder="Enter your mail-id" required>
             </div>
             <div class="input-group">
                 <label for="password">Password</label>
                 <input type="password" id="password" name="password" placeholder="Create password" required>
             </div>
-
-            <!-- Password Recommendations Section -->
             <div class="password-recommendations">
                 <p id="length" class="condition">At least 8 characters</p>
                 <p id="uppercase" class="condition">Contains uppercase letters</p>
                 <p id="lowercase" class="condition">Contains lowercase letters</p>
                 <p id="number" class="condition">Contains numbers</p>
                 <p id="special" class="condition">Contains special characters</p>
-    
-
+            </div>
             <div class="input-group">
                 <label for="confirm-password">Confirm Password</label>
                 <input type="password" id="confirm-password" name="confirm-password" placeholder="Re-enter password" required>
             </div>
-            <div id="password-error" class="error-message"></div> <!-- Password error container -->
+            <div id="password-error" class="error-message"></div>
             <button type="submit" class="signup-button">Sign Up</button>
         </form>
         <div class="or-divider">
@@ -72,7 +69,7 @@ <h1>Create Your Account</h1>
         </div>
     </div>
 
-    <script src="https://accounts.google.com/gsi/client" async defer></script>
-    <script src="signup.js"></script> <!-- Link to the signup.js file -->
+    <script src="signup.js"></script>
 </body>
 </html>
+
diff --git a/SignUp/signup.js b/SignUp/signup.js
index bd139f02..cb655e77 100644
--- a/SignUp/signup.js
+++ b/SignUp/signup.js
@@ -1,59 +1,24 @@
 document.addEventListener("DOMContentLoaded", () => {
     const signupButton = document.querySelector(".signup-button");
 
-    // List of trusted email domains
-    const trustedDomains = ["gmail.com", "outlook.com", "yahoo.com", "hotmail.com" , "protonmail.com" , "icloud.com" , "tutanota.com"];
-
     signupButton.addEventListener("click", (e) => {
         e.preventDefault();
-
         const name = document.querySelector("#username").value;
         const email = document.querySelector("#email").value;
         const password = document.querySelector("#password").value;
         const confirmPassword = document.querySelector("#confirm-password").value;
-        const emailError = document.querySelector("#email-error"); // Reference to email error div
-        const passwordError = document.querySelector("#password-error"); // Reference to password error div
-
-        // Clear any previous error messages
-        emailError.textContent = "";
-        emailError.style.display = "none"; // Hide the error message by default
-        passwordError.textContent = "";
-        passwordError.style.display = "none"; // Hide the error message by default
 
         if (!name || !email || !password || !confirmPassword) {
-            emailError.textContent = "Every field is required.";
-            emailError.style.display = "block";
+            alert("Every field is required.");
             return;
         }
 
-        // Email domain validation
-        const emailDomain = email.split("@")[1]; // Get the domain from the email
-        if (!trustedDomains.includes(emailDomain)) {
-            emailError.textContent = "Please use an email address from a trusted provider (e.g., Gmail, Outlook, Yahoo) etc.";
-            emailError.style.display = "block";
-            return;
-        }
-
-        // Password matching validation
         if (password !== confirmPassword) {
-            passwordError.textContent = "Passwords do not match.";
-            passwordError.style.display = "block";
+            alert("Passwords do not match.");
             return;
         }
-        
-        const emailPattern = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
-        if (!emailPattern.test(email)) {
-            alert("Please enter a valid email address.");
-            return; // Stop the function if the email is not in the right format
-        }
-
-        const userdata = {
-            name,
-            email,
-            password,
-            confirmPassword
-        };
 
+        const userdata = { name, email, password };
         registerUser(userdata);
     });
 
@@ -64,12 +29,15 @@ document.addEventListener("DOMContentLoaded", () => {
                 headers: { "content-type": "application/json" },
                 body: JSON.stringify(user)
             });
-
             const data = await res.json();
-            console.log(data);
-            window.location.href = "http://127.0.0.1:5500/Collect-your-GamingTools/login/login.html";
+            if (data.success) {
+                alert('Signup successful! Redirecting to login...');
+                window.location.href = "../login/login.html"; // Redirect after signup
+            } else {
+                alert(data.message); // Show error message
+            }
         } catch (err) {
-            console.log(err.message);
+            alert('Error: ' + err.message); // Show error message
         }
     };
 
diff --git a/backend/app.js b/backend/app.js
index 84d8ceb0..b7779273 100644
--- a/backend/app.js
+++ b/backend/app.js
@@ -12,7 +12,9 @@ databaseconnect();
 app.use(express.json()); // Built-in middleware
 app.use(cookieParser()); // Third-party middleware
 
-app.use(cors({ origin: [process.env.CLIENT_URL], credentials: true })); //Third-party middleware
+// app.use(cors({ origin: [process.env.CLIENT_URL], credentials: true })); //Third-party middleware
+app.use(cors({ origin: "https://collect-your-gamingtools.netlify.app", credentials: true }));
+
 
 // Auth router
 app.use('/auth', authRouter);
diff --git a/backend/package-lock.json b/backend/package-lock.json
index 8be6ff87..823a2a10 100644
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
@@ -16,8 +16,10 @@
         "dotenv": "^16.4.5",
         "email-validator": "^2.0.4",
         "express": "^4.21.0",
+        "express-rate-limit": "^7.4.1",
         "jsonwebtoken": "^9.0.2",
         "mongoose": "^8.7.0",
+        "nodemailer": "^6.9.15",
         "nodemon": "^3.1.5"
       }
     },
@@ -547,6 +549,21 @@
         "node": ">= 0.10.0"
       }
     },
+    "node_modules/express-rate-limit": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.4.1.tgz",
+      "integrity": "sha512-KS3efpnpIDVIXopMc65EMbWbUht7qvTCdtCR2dD/IZmi9MIkopYESwyRqLgv8Pfu589+KqDqOdzJWW7AHoACeg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/express-rate-limit"
+      },
+      "peerDependencies": {
+        "express": "4 || 5 || ^5.0.0-beta.1"
+      }
+    },
     "node_modules/express/node_modules/cookie": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
@@ -1315,6 +1332,15 @@
         "webidl-conversions": "^3.0.0"
       }
     },
+    "node_modules/nodemailer": {
+      "version": "6.9.15",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.15.tgz",
+      "integrity": "sha512-AHf04ySLC6CIfuRtRiEYtGEXgRfa6INgWGluDhnxTZhHSKvrBu7lc1VVchQ0d8nPc4cFaZoPq8vkyNoZr0TpGQ==",
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/nodemon": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.5.tgz",
diff --git a/backend/package.json b/backend/package.json
index 2d1344de..39bbb33c 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -17,10 +17,11 @@
     "crypto": "^1.0.1",
     "dotenv": "^16.4.5",
     "email-validator": "^2.0.4",
-    "nodemailer": "^6.9.15",
     "express": "^4.21.0",
+    "express-rate-limit": "^7.4.1",
     "jsonwebtoken": "^9.0.2",
     "mongoose": "^8.7.0",
+    "nodemailer": "^6.9.15",
     "nodemon": "^3.1.5"
   }
 }
diff --git a/login/auth.js b/login/auth.js
index c6f5887e..d51f9fa3 100644
--- a/login/auth.js
+++ b/login/auth.js
@@ -1,68 +1,56 @@
-
-  import { initializeApp } from "https://www.gstatic.com/firebasejs/10.14.1/firebase-app.js";
-  import { getAuth, signOut, onAuthStateChanged, GoogleAuthProvider, signInWithPopup } from "https://www.gstatic.com/firebasejs/10.14.1/firebase-auth.js";
-
-  // Firebase configuration
-  const firebaseConfig = {
-    apiKey: process.env.FIREBASE_API_KEY,
-    authDomain: process.env.FIREBASE_AUTH_DOMAIN,
-    projectId: process.env.FIREBASE_PROJECT_ID,
-    storageBucket: process.env.FIREBASE_STORAGE_BUCKET,
-    messagingSenderId: process.env.FIREBASE_MESSAGING_SENDER_ID,
-    appId: process.env.FIREBASE_APP_ID,
+import { initializeApp } from "https://www.gstatic.com/firebasejs/10.14.1/firebase-app.js";
+import { getAuth, signOut, onAuthStateChanged, GoogleAuthProvider, signInWithPopup } from "https://www.gstatic.com/firebasejs/10.14.1/firebase-auth.js";
+
+// Firebase configuration
+const firebaseConfig = {
+    apiKey: "YOUR_API_KEY",
+    authDomain: "YOUR_AUTH_DOMAIN",
+    projectId: "YOUR_PROJECT_ID",
+    storageBucket: "YOUR_STORAGE_BUCKET",
+    messagingSenderId: "YOUR_MESSAGING_SENDER_ID",
+    appId: "YOUR_APP_ID"
 };
 
+// Initialize Firebase
+const app = initializeApp(firebaseConfig);
+const auth = getAuth(app);
+const provider = new GoogleAuthProvider();
 
-
-  // Initialize Firebase
-  const app = initializeApp(firebaseConfig);
-  const auth = getAuth(app);
-  auth.languageCode = "en";
-  const provider = new GoogleAuthProvider();
-
-  // Sign in with Google
-  const googleLoginBtn = document.getElementById('google-login-btn');
-  googleLoginBtn?.addEventListener('click', function () {
+// Sign in with Google
+document.getElementById('google-login-btn').addEventListener('click', function () {
     signInWithPopup(auth, provider)
-      .then((result) => {
-        const user = result.user;
-        console.log('User logged in:', user);
-
-        // Redirect to the home page
-        window.location.href = "../index.html";
-      })
-      .catch((error) => {
-        console.error('Login error:', error);
-      });
-  });
-
-  // Handle auth state change and toggle login/logout button
-  window.addEventListener('load', () => {
+        .then((result) => {
+            const user = result.user;
+            alert(`Welcome ${user.displayName}!`);
+            window.location.href = "../index.html";
+        })
+        .catch((error) => {
+            alert('Login failed: ' + error.message);
+        });
+});
+
+// Handle auth state change
+onAuthStateChanged(auth, (user) => {
     const authLink = document.getElementById('auth-link');
-
-    onAuthStateChanged(auth, (user) => {
-      if (user) {
-        // If the user is logged in, change the link to "Logout"
+    if (user) {
         authLink.textContent = 'Logout';
-        authLink.removeAttribute('href');
-        authLink.addEventListener('click', handleLogout);
-      } else {
-        // If the user is not logged in, change the link to "Login"
+        authLink.onclick = handleLogout;
+    } else {
         authLink.textContent = 'Login';
         authLink.setAttribute('href', 'login/login.html');
-        authLink.removeEventListener('click', handleLogout);
-      }
-    });
-  });
+    }
+});
 
-  // Handle logout
-  function handleLogout() {
+// Handle logout
+function handleLogout() {
     signOut(auth)
-      .then(() => {
-        console.log('User logged out');
-        window.location.reload(); // Reload the page if needed
-      })
-      .catch((error) => {
-        console.error('Logout error:', error);
-      });
-  }
+        .then(() => {
+            alert('Logged out successfully!');
+            window.location.reload();
+        })
+        .catch((error) => {
+            alert('Logout failed: ' + error.message);
+        });
+}
+
+
diff --git a/login/login.html b/login/login.html
index e985fdf6..de110417 100644
--- a/login/login.html
+++ b/login/login.html
@@ -6,24 +6,18 @@
     <title>Collect Your Gaming Tools - Login</title>
     <link rel="shortcut icon" href="logo.png" type="image/x-icon">
     <link href="https://fonts.googleapis.com/css2?family=Orbitron:wght@500&family=Roboto:wght@400&display=swap" rel="stylesheet">
-    <script src="https://unpkg.com/ionicons@5.5.2/dist/ionicons.js"></script>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.13.0/css/all.min.css">
     <link rel="stylesheet" href="login.css">
     <script src="auth.js" defer type="module"></script>
-
 </head>
 <body>
     <div class="button-container">
-        <a href="../index.html" class="back-button">
-            <span class="arrow">←</span> <!-- Arrow icon -->
-            Back
-        </a>
-    </div>    
+        <a href="../index.html" class="back-button">← Back</a>
+    </div>
     <div class="login-container">
         <div class="login-box">
             <h1 class="login-title">Welcome to Gaming Tools Store!</h1>
             <p class="subtitle">Enter your credentials to continue shopping for the best gaming gear.</p>
-            <form action="#" method="post">
+            <form id="login-form" method="post">
                 <div class="input-group">
                     <label for="gmail">Gmail</label>
                     <input type="text" id="gmail" name="username" placeholder="Enter your mail-id" required>
@@ -34,15 +28,12 @@ <h1 class="login-title">Welcome to Gaming Tools Store!</h1>
                     <i class="far fa-eye" id="togglePassword" aria-label="Toggle password visibility"></i>
                 </div>
                 <button type="submit" class="login-button">Login</button>
+                <button id='google-login-btn' type="button">Login with Google</button>
             </form>
             <div class="links">
                 <a href="forgot.html" class="hal2">Forgot Password?</a>
                 <a href="../SignUp/signup.html" class="hal">Sign Up</a>
             </div>
-            <div class="social-login">
-                <p>Or Login With</p>
-                <button id='google-login-btn' class="social-button google">Login with Google</button>
-            </div>
         </div>
     </div>
     <footer class="footer">
@@ -70,8 +61,8 @@ <h1 class="login-title">Welcome to Gaming Tools Store!</h1>
         <p>&copy;2024 Collect your Gaming Tools | All Rights Reserved</p>
     </footer>
 
+    
     <script>
-        const loginButton = document.querySelector(".login-button");
         const togglePassword = document.getElementById('togglePassword');
         const passwordInput = document.getElementById('password');
 
@@ -81,24 +72,19 @@ <h1 class="login-title">Welcome to Gaming Tools Store!</h1>
             this.classList.toggle('fa-eye-slash');
         });
 
-        loginButton.addEventListener("click", (e) => {
+        document.getElementById("login-form").addEventListener("submit", async (e) => {
             e.preventDefault();
-
             const email = document.querySelector("#gmail").value;
             const password = document.querySelector("#password").value;
 
             const emailPattern = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
             if (!emailPattern.test(email)) {
                 alert("Please enter a valid email address.");
-                return; // Stop the function if email is not in the right format
+                return;
             }
             
-            const userData = {
-                email,
-                password
-            };
-            console.log(userData);
-            loginUser(userData);
+            const userData = { email, password };
+            await loginUser(userData);
         });
 
         const loginUser = async (user) => {
@@ -106,20 +92,20 @@ <h1 class="login-title">Welcome to Gaming Tools Store!</h1>
                 const res = await fetch("http://localhost:5000/auth/signin", {
                     method: "POST",
                     credentials: "include",
-                    redirect: "follow",
-                    headers: { "content-type": "application/json" },
+                    headers: { "Content-Type": "application/json" },
                     body: JSON.stringify(user)
                 });
-                if (!res.ok) {
-                    throw new Error(`HTTP error! status: ${res.status}`);
-                }
+
                 const data = await res.json();
-                window.location.href = "http://127.0.0.1:5500/Collect-your-GamingTools/index.html";
+                if (res.ok) {
+                    window.location.href = "../index.html"; // Updated URL
+                } else {
+                    alert(data.message);
+                }
             } catch (e) {
-                console.log(e.message);
+                alert('Error: ' + e.message);
             }
         };
     </script>
-    <script src="https://kit.fontawesome.com/856f4a44d7.js" crossorigin="anonymous"></script>
 </body>
-</html>
\ No newline at end of file
+</html
\ No newline at end of file