diff --git a/src/App.jsx b/src/App.jsx
index 7281dd5..e3a0567 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,11 +1,16 @@
 import { useState } from "react";
 import { RouterProvider } from "react-router-dom";
+import { MyProvider } from "./context/MyContext";
 
 import routes from "./routes";
 import "./App.css";
 
 function App() {
-  return <RouterProvider router={routes} />;
+  return (
+    <MyProvider>
+      <RouterProvider router={routes} />
+    </MyProvider>
+  );
 }
 
 export default App;
diff --git a/src/api/api.config.js b/src/api/api.config.js
index 68cd41e..5414e7c 100644
--- a/src/api/api.config.js
+++ b/src/api/api.config.js
@@ -1,8 +1,8 @@
-export const API_BASE_URL = import.meta.env.VITE_API_BASE_URL || 'http://localhost:8000';
+export const API_BASE_URL = import.meta.env.VITE_API_BASE_URL || 'http://localhost:8080';
 
 export const endpoints = {
     // Auth endpoints
-    register: `${API_BASE_URL}/api/v1/users/register`,
+    register: `${API_BASE_URL}/users/create`,
     login: `${API_BASE_URL}/api/v1/users/login`,
     logout: `${API_BASE_URL}/api/v1/users/logout`,
 
diff --git a/src/api/auth/register.js b/src/api/auth/register.js
index 7eb8cf9..f2913c3 100644
--- a/src/api/auth/register.js
+++ b/src/api/auth/register.js
@@ -3,19 +3,22 @@ import api from "../api.intercepter";
 
 /**
  * Register function that creates a new user account
- * @param {string} firstName - User's first name
- * @param {string} lastName - User's last name
- * @param {string} email - User email
- * @param {string} password - User password
- * @returns {Promise} - Promise that resolves to the registration response
+ * @param {Object} userData - User registration data
+ * @param {string} userData.name - User's full name
+ * @param {string} userData.username - User's username
+ * @param {string} userData.email - User email
+ * @param {string} userData.password - User password
+ * @returns {Promise} - Promise that resolves to the registration response (timestamp)
  */
-export const registerAPI = async (firstName, lastName, email, password) => {
+export const registerAPI = async (userData) => {
     try {
+        const { name, username, email, password } = userData;
         const response = await api.post(endpoints.register, {
-            firstName,
-            lastName,
+            name,
+            username,
             email,
             password,
+            blogs: []
         });
         return response.data;
     } catch (error) {
diff --git a/src/context/MyContext.jsx b/src/context/MyContext.jsx
index 6b68f2e..779051e 100644
--- a/src/context/MyContext.jsx
+++ b/src/context/MyContext.jsx
@@ -3,10 +3,16 @@ import { createContext, useContext, useState, useCallback } from "react";
 const MyContext = createContext();
 
 export const MyProvider = ({ children }) => {
-  const [userProfile, setUserProfile] = useState(null);
+  const [userProfile, setUserProfile] = useState(() => {
+    const storedUser = localStorage.getItem('user');
+    return storedUser ? JSON.parse(storedUser) : null;
+  });
   const [isLoading, setIsLoading] = useState(false);
   const [error, setError] = useState(null);
   const [profileFetched, setProfileFetched] = useState(false);
+  const [isAuthenticated, setIsAuthenticated] = useState(
+    () => localStorage.getItem('isAuthenticated') === 'true'
+  );
 
   const updateUserProfile = useCallback((profile) => {
     setUserProfile(profile);
@@ -14,6 +20,11 @@ export const MyProvider = ({ children }) => {
     setProfileFetched(true);
   }, []);
 
+  const setAuthenticatedState = useCallback((authenticated) => {
+    setIsAuthenticated(authenticated);
+    localStorage.setItem('isAuthenticated', authenticated.toString());
+  }, []);
+
   const setLoadingState = useCallback((loading) => {
     setIsLoading(loading);
   }, []);
@@ -31,6 +42,9 @@ export const MyProvider = ({ children }) => {
     setUserProfile(null);
     setProfileFetched(false);
     setError(null);
+    setIsAuthenticated(false);
+    localStorage.removeItem('isAuthenticated');
+    localStorage.removeItem('user');
   }, []);
 
   return (
@@ -40,11 +54,13 @@ export const MyProvider = ({ children }) => {
         isLoading,
         error,
         profileFetched,
+        isAuthenticated,
         updateUserProfile,
         setLoadingState,
         setErrorState,
         clearError,
         clearUserProfile,
+        setAuthenticatedState,
       }}
     >
       {children}
diff --git a/src/pages/RegisterPage.jsx b/src/pages/RegisterPage.jsx
index 510f652..2877844 100644
--- a/src/pages/RegisterPage.jsx
+++ b/src/pages/RegisterPage.jsx
@@ -2,11 +2,14 @@ import { useState } from "react";
 import { Link, useNavigate } from "react-router-dom";
 import { useMyContext } from "../context/MyContext";
 import { FiEye, FiEyeOff } from "react-icons/fi";
+import { registerAPI } from "../api";
+import { setAuthData } from "../api/utils/auth";
 import "./AuthPages.css";
 
 const RegisterPage = () => {
   const [formData, setFormData] = useState({
     name: "",
+    username: "",
     email: "",
     password: "",
     confirmPassword: "",
@@ -15,7 +18,7 @@ const RegisterPage = () => {
   const [isLoading, setIsLoading] = useState(false);
   const [showPassword1, setShowPassword1] = useState(false);
   const [showPassword2, setShowPassword2] = useState(false);
-  const { updateUserProfile, setLoadingState, setErrorState } = useMyContext();
+  const { setLoadingState, setErrorState, updateUserProfile, setAuthenticatedState } = useMyContext();
   const navigate = useNavigate();
 
   const handleChange = (e) => {
@@ -42,6 +45,14 @@ const RegisterPage = () => {
       newErrors.name = "Name must be at least 2 characters";
     }
 
+    if (!formData.username.trim()) {
+      newErrors.username = "Username is required";
+    } else if (formData.username.trim().length < 3) {
+      newErrors.username = "Username must be at least 3 characters";
+    } else if (!/^[a-zA-Z0-9_]+$/.test(formData.username)) {
+      newErrors.username = "Username can only contain letters, numbers, and underscores";
+    }
+
     if (!formData.email.trim()) {
       newErrors.email = "Email is required";
     } else if (!/\S+@\S+\.\S+/.test(formData.email)) {
@@ -75,20 +86,34 @@ const RegisterPage = () => {
     setLoadingState(true);
 
     try {
-      // Simulate API call - replace with actual registration logic
-      await new Promise((resolve) => setTimeout(resolve, 2000));
+      // Call the actual register API
+      const response = await registerAPI({
+        name: formData.name,
+        username: formData.username,
+        email: formData.email,
+        password: formData.password
+      });
 
-      // Mock successful registration - replace with actual API response
-      const mockUser = {
-        id: Date.now(),
+      // Registration successful - auto-login the user
+      const userData = {
+        id: response, // Using response as user ID
         name: formData.name,
+        username: formData.username,
         email: formData.email,
       };
 
-      updateUserProfile(mockUser);
-      navigate("/dashboard");
+
+      
+      // Set authentication state and user data
+      setAuthenticatedState(true);
+      localStorage.setItem('user', JSON.stringify(userData));
+      updateUserProfile(userData);
+      setErrorState(""); // Clear any previous errors
+      
+      // Force a full page reload to dashboard to bypass React state timing issues
+      window.location.replace('/dashboard');
     } catch (error) {
-      setErrorState("Registration failed. Please try again.");
+      setErrorState(error.message || "Registration failed. Please try again.");
     } finally {
       setIsLoading(false);
       setLoadingState(false);
@@ -124,6 +149,25 @@ const RegisterPage = () => {
               )}
             </div>
 
+            <div className="form-group">
+              <label htmlFor="username" className="form-label">
+                Username
+              </label>
+              <input
+                type="text"
+                id="username"
+                name="username"
+                value={formData.username}
+                onChange={handleChange}
+                className={`form-input ${errors.username ? "error" : ""}`}
+                placeholder="Choose a username"
+                disabled={isLoading}
+              />
+              {errors.username && (
+                <span className="error-message">{errors.username}</span>
+              )}
+            </div>
+
             <div className="form-group">
               <label htmlFor="email" className="form-label">
                 Email Address
diff --git a/src/routes/ProtectedRoute.jsx b/src/routes/ProtectedRoute.jsx
index 34c64a6..8116515 100644
--- a/src/routes/ProtectedRoute.jsx
+++ b/src/routes/ProtectedRoute.jsx
@@ -1,8 +1,12 @@
 import { Navigate } from "react-router-dom";
-import { isAuthenticated } from "../api";
+import { useMyContext } from "../context/MyContext";
 
 function ProtectedRoute({ children }) {
-  if (!isAuthenticated()) {
+  const { userProfile, isAuthenticated } = useMyContext();
+
+  // Check if user is authenticated using context state
+  if (!userProfile || !isAuthenticated) {
+    console.log('ProtectedRoute - Redirecting to login');
     return <Navigate to="/login" replace />;
   }
 
diff --git a/src/routes/PublicRoute.jsx b/src/routes/PublicRoute.jsx
index 8a083a7..050ce27 100644
--- a/src/routes/PublicRoute.jsx
+++ b/src/routes/PublicRoute.jsx
@@ -1,9 +1,10 @@
 import { Navigate } from "react-router-dom";
-import { isAuthenticated } from "../api";
+import { useMyContext } from "../context/MyContext";
 
 function PublicRoute({ children }) {
-  if (isAuthenticated()) {
-    return <Navigate to="/" replace />;
+  const { isAuthenticated } = useMyContext();
+  if (isAuthenticated) {
+    return <Navigate to="/dashboard" replace />;
   }
 
   return children;