diff --git a/frontend/src/pages/CheckoutPage.jsx b/frontend/src/pages/CheckoutPage.jsx
index 999b80e..a4235ad 100644
--- a/frontend/src/pages/CheckoutPage.jsx
+++ b/frontend/src/pages/CheckoutPage.jsx
@@ -29,7 +29,7 @@ const steps = ['Shipping Address', 'Review Order', 'Payment', 'Confirmation'];
 
 const CheckoutPage = () => {
   const navigate = useNavigate();
-  const { user } = useAuth();
+  const { user, userData } = useAuth();
   const { items, total, itemCount } = useCart();
   const checkout = useCheckout();
   const { createCheckoutSession, isLoading: isStripeLoading } = useStripe();
@@ -43,13 +43,13 @@ const CheckoutPage = () => {
   
   // State for form data
   const [formData, setFormData] = useState({
-    firstName: user?.first_name || '',
-    lastName: user?.last_name || '',
-    email: user?.email || '',
+    firstName: userData?.first_name || '',
+    lastName: userData?.last_name || '',
+    email: userData?.email || '',
     address: '',
     city: '',
-    state: '',
-    zipCode: '',
+    province: '',
+    postalCode: '',
     country: '',
     saveAddress: false,
   });
@@ -93,7 +93,7 @@ const CheckoutPage = () => {
   
   // Validate shipping form
   const validateShippingForm = () => {
-    const requiredFields = ['firstName', 'lastName', 'email', 'address', 'city', 'state', 'zipCode', 'country'];
+    const requiredFields = ['firstName', 'lastName', 'email', 'address', 'city', 'province', 'postalCode', 'country'];
     
     for (const field of requiredFields) {
       if (!formData[field]) {
@@ -125,10 +125,10 @@ const CheckoutPage = () => {
     try {
       // Format shipping address
       const shippingAddress = `${formData.firstName} ${formData.lastName}
-${formData.address}
-${formData.city}, ${formData.state} ${formData.zipCode}
-${formData.country}
-${formData.email}`;
+      ${formData.address}
+      ${formData.city}, ${formData.province} ${formData.postalCode}
+      ${formData.country}
+      ${formData.email}`;
       
       // Call the checkout API to create the order
       const orderResponse = await checkout.mutateAsync({
@@ -265,10 +265,10 @@ ${formData.email}`;
                 <TextField
                   required
                   fullWidth
-                  id="state"
-                  label="State/Province"
-                  name="state"
-                  value={formData.state}
+                  id="province"
+                  label="Province/State"
+                  name="province"
+                  value={formData.province}
                   onChange={handleChange}
                 />
               </Grid>
@@ -276,10 +276,10 @@ ${formData.email}`;
                 <TextField
                   required
                   fullWidth
-                  id="zipCode"
-                  label="Zip / Postal code"
-                  name="zipCode"
-                  value={formData.zipCode}
+                  id="postalCode"
+                  label="Postal / Zip code"
+                  name="postalCode"
+                  value={formData.postalCode}
                   onChange={handleChange}
                 />
               </Grid>
@@ -358,7 +358,7 @@ ${formData.email}`;
               {formData.address}
             </Typography>
             <Typography gutterBottom>
-              {formData.city}, {formData.state} {formData.zipCode}
+              {formData.city}, {formData.province} {formData.postalCode}
             </Typography>
             <Typography gutterBottom>
               {formData.country}