diff --git a/apps/frontend/app/dashboard/profile/page.tsx b/apps/frontend/app/dashboard/profile/page.tsx
index 96b3a25..13249e2 100644
--- a/apps/frontend/app/dashboard/profile/page.tsx
+++ b/apps/frontend/app/dashboard/profile/page.tsx
@@ -6,7 +6,7 @@
 
 'use client';
 
-import { useState } from 'react';
+import { useState, useEffect } from 'react';
 import { useAuth } from '@/lib/context/auth-context';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { useForm } from 'react-hook-form';
@@ -44,7 +44,7 @@ const profileSchema = z.object({
 type ProfileFormData = z.infer<typeof profileSchema>;
 
 export default function ProfilePage() {
-  const { user, refreshUser } = useAuth();
+  const { user, refreshUser, loading } = useAuth();
   const queryClient = useQueryClient();
   const [activeTab, setActiveTab] = useState<'profile' | 'password'>('profile');
   const [successMessage, setSuccessMessage] = useState('');
@@ -65,6 +65,18 @@ export default function ProfilePage() {
     resolver: zodResolver(passwordSchema),
   });
 
+  // Update form values when user data loads
+  useEffect(() => {
+    if (user) {
+      profileForm.reset({
+        firstName: user.firstName,
+        lastName: user.lastName,
+        email: user.email,
+      });
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [user]);
+
   // Update profile mutation
   const updateProfileMutation = useMutation({
     mutationFn: (data: ProfileFormData) => {
@@ -112,6 +124,35 @@ export default function ProfilePage() {
     updatePasswordMutation.mutate(data);
   };
 
+  // Show loading state while user data is being fetched
+  if (loading) {
+    return (
+      <div className="flex items-center justify-center min-h-screen">
+        <div className="text-center">
+          <div className="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-600 mx-auto mb-4"></div>
+          <p className="text-gray-600">Loading profile...</p>
+        </div>
+      </div>
+    );
+  }
+
+  // Show error if user is not found after loading
+  if (!loading && !user) {
+    return (
+      <div className="flex items-center justify-center min-h-screen">
+        <div className="text-center">
+          <p className="text-red-600 mb-4">Unable to load user profile</p>
+          <button
+            onClick={() => window.location.reload()}
+            className="px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700"
+          >
+            Retry
+          </button>
+        </div>
+      </div>
+    );
+  }
+
   return (
     <div className="max-w-4xl mx-auto space-y-6">
       {/* Header */}
diff --git a/apps/frontend/lib/api/users.ts b/apps/frontend/lib/api/users.ts
index 87f6d80..0ab2ccb 100644
--- a/apps/frontend/lib/api/users.ts
+++ b/apps/frontend/lib/api/users.ts
@@ -103,7 +103,7 @@ export const usersApi = {
   /**
    * Change password
    */
-  async changePassword(data: ChangePasswordRequest): Promise<void> {
-    return apiClient.post<void>('/api/v1/users/change-password', data);
+  async changePassword(data: ChangePasswordRequest): Promise<{ message: string }> {
+    return apiClient.patch<{ message: string }>('/api/v1/users/me/password', data);
   },
 };