diff --git a/backend/server.js b/backend/server.js
index 48d6ccfb..52bcd442 100644
--- a/backend/server.js
+++ b/backend/server.js
@@ -14,6 +14,14 @@ const logger = require('./logger');
 const app = express();
 
 // CORS configuration
+const allowedOrigins = (process.env.FRONTEND_URL || 'http://localhost:5173')
+    .split(',')
+    .map((origin) => origin.trim())
+    .filter(Boolean);
+
+app.use(cors({
+    origin: allowedOrigins,
+    credentials: true,
 const allowedOrigins = ['http://localhost:5173', 'https://github-spy.etlify.app'];
 app.use(cors({
     origin: function (origin, callback) {
diff --git a/src/pages/Login/Login.tsx b/src/pages/Login/Login.tsx
index 92b7073e..b07665fd 100644
--- a/src/pages/Login/Login.tsx
+++ b/src/pages/Login/Login.tsx
@@ -30,11 +30,15 @@ const Login: React.FC = () => {
     setIsLoading(true);
 
     try {
-      const response = await axios.post(`${backendUrl}/api/auth/login`, formData);
+      const response = await axios.post(
+        `${backendUrl}/api/auth/login`,
+        formData,
+        { withCredentials: true }
+      );
       setMessage(response.data.message);
 
       if (response.data.message === 'Login successful') {
-        navigate("/");
+        navigate("/home");
       }
     } catch (error: unknown) {
       if (axios.isAxiosError(error)) {
diff --git a/src/pages/Signup/Signup.tsx b/src/pages/Signup/Signup.tsx
index 2ac51dcc..a568ccc4 100644
--- a/src/pages/Signup/Signup.tsx
+++ b/src/pages/Signup/Signup.tsx
@@ -83,6 +83,39 @@ const SignUp: React.FC = () => {
     }
     setIsLoading(true);
     try {
+      const response = await axios.post(
+        `${backendUrl}/api/auth/signup`,
+        formData,
+        { withCredentials: true }
+      );
+      setMessage(response.data.message); // Show success message from backend
+
+      // Navigate to login page after successful signup
+      if (response.data.message === 'User created successfully') {
+        navigate("/login");}
+
+    
+    // // Simulate API call (replace with your actual backend integration)
+    // try {
+    //   // Mock successful signup
+    //   setMessage("Account created successfully! Redirecting to login...");
+      
+    //   // In your actual implementation, integrate with your backend here:
+    //   // const response = await fetch(`${backendUrl}/api/auth/signup`, {
+    //   //   method: 'POST',
+    //   //   headers: { 'Content-Type': 'application/json' },
+    //   //   body: JSON.stringify(formData)
+    //   // });
+      
+    //   setTimeout(() => {
+    //     // Navigate to login page in your actual implementation
+    //     console.log("Redirecting to login page...");
+    //   }, 2000);
+      
+    } catch (error) {
+      setMessage("Something went wrong. Please try again.");
+      const response = await axios.post(`${backendUrl}/api/auth/signup`, formData);
+      setMessage(response.data.message);
       const response = await axios.post(`${backendUrl}/api/auth/signup`,
         formData // Include cookies for session
       );