diff --git a/code/client/src/components/CreateGoal.js b/code/client/src/components/CreateGoal.js
index 08fa80c94..e574d2579 100644
--- a/code/client/src/components/CreateGoal.js
+++ b/code/client/src/components/CreateGoal.js
@@ -1,8 +1,7 @@
+import React, { useState, useEffect } from "react"; // Added useEffect import
 import apiClient from "../services/apiClient.js";
-import React, { useState } from "react";
 import { validateGoalForm } from '../utils/validateGoalForm.js';
 import { authenticated } from "../utils/authenticate.js";
-
 import {
   Box,
   Typography,
@@ -24,7 +23,16 @@ import {
 } from "./style/styles.js";
 
 function CreateGoal() {
-  authenticated();
+  // Profile Data State
+  const [profileData, setProfileData] = useState({
+    userId: "",
+    email: "",
+    name: "",
+    gender: "",
+    dob: { year: 1900, month: 1, day: 1 },
+    height: { feet: "", inches: "" },
+  });
+
   const [goalFormData, setGoalFormData] = useState({
     type: "",
     targetValue: 0,
@@ -32,6 +40,26 @@ function CreateGoal() {
 
   const [successMessage, setSuccessMessage] = useState('');
   const [errorMessage, setErrorMessage] = useState('');
+  const [error, setError] = useState(null); // State for managing error when fetching profile
+
+  // useEffect to fetch profile data
+  useEffect(() => {
+    const token = authenticated();
+
+    if (token) {
+      apiClient
+        .get("/api/users/manage-profile", {
+          headers: { Authorization: `Bearer ${token}` },
+        }) // Fetch user profile data from the backend
+        .then((res) => {
+          setProfileData(res.data); // Set the fetched profile data
+        })
+        .catch((err) => {
+          setError("Error fetching profile data. Try refreshing.");
+          console.log(err);
+        });
+    }
+  }, []); // Empty dependency array to run only once after the component mounts
 
   // Handle input changes
   const handleChange = (e) => {
@@ -42,77 +70,76 @@ function CreateGoal() {
     }));
   };
 
-// Function to handle the form submission event
-const handleSubmit = (event) => {
-  event.preventDefault(); // Prevent default form submission behavior (e.g., page reload)
-  
-  // Clear any existing messages before processing the form
-  clearMessages();
-
-  // Validate the form and, if valid, proceed with goal creation
-  if (validateAndSetMessages(goalFormData)) {
-    createGoal(goalFormData);
-  }
-};
-
-// Function to clear any success or error messages
-const clearMessages = () => {
-  setSuccessMessage('');
-  setErrorMessage('');
-};
-
-// Function to validate the goal form and handle validation messages
-const validateAndSetMessages = (formData) => {
-  const validationResult = validateGoalForm(formData);
-
-  if (!validationResult.isValid) {
-    setErrorMessage('Error: Please review your inputs and try again');
-    return false; // Prevent form submission if validation fails
-  }
-
-  return true;
-};
-
-// Function to create a new goal by making a POST request
-const createGoal = async (formData) => {
-  try {
-    console.log("Creating new goal with data:", formData);
-    // Sends a POST request to the backend with the form data
-    await apiClient.post("/api/goals/create-goal", formData);
-    handleGoalSuccess(); // Handle the success case
-  } catch (error) {
-    handleGoalError(error); // Handle the error case
-  }
-};
-
-// Function to handle a successful goal creation
-const handleGoalSuccess = () => {
-  console.log("Goal created successfully!");
-  setSuccessMessage('New goal successful!');
-};
-
-// Function to handle errors during goal creation
-const handleGoalError = (error) => {
-  console.error("Error creating goal:", error);
-  setErrorMessage('Failed to create a new goal. Please try again.');
-};
+  // Function to handle the form submission event
+  const handleSubmit = (event) => {
+    event.preventDefault(); // Prevent default form submission behavior
+    clearMessages();
 
+    if (validateAndSetMessages(goalFormData)) {
+      createGoal(goalFormData);
+    }
+  };
+
+  // Clear messages
+  const clearMessages = () => {
+    setSuccessMessage('');
+    setErrorMessage('');
+  };
+
+  // Validate form
+  const validateAndSetMessages = (formData) => {
+    const validationResult = validateGoalForm(formData);
+    if (!validationResult.isValid) {
+      setErrorMessage('Error: Please review your inputs and try again');
+      return false;
+    }
+    return true;
+  };
+
+  // Create goal
+  const createGoal = async (formData) => {
+    try {
+      console.log("Creating new goal with data:", formData);
+
+      const token = authenticated();
+      console.log("Token:", token);
+
+      await apiClient.post("/api/goals/create-goal", formData, {
+        headers: { Authorization: `Bearer ${token}` }, // Pass token
+      });
+      
+      handleGoalSuccess();
+    } catch (error) {
+      handleGoalError(error);
+    }
+  };
+
+  // Handle success
+  const handleGoalSuccess = () => {
+    console.log("Goal created successfully!");
+    setSuccessMessage('New goal successful!');
+  };
+
+  // Handle error
+  const handleGoalError = (error) => {
+    console.error("Error creating goal:", error);
+    setErrorMessage('Failed to create a new goal. Please try again.');
+  };
 
   return (
     <Box sx={box}>
       <Typography variant="h6" gutterBottom sx={title}>
         Set up your goal here:
       </Typography>
-      {/* Set up your goal here:  */}
       <form onSubmit={handleSubmit}>
         <Grid2 container spacing={2}>
-          {/*  Select a goal type */}
+          {/* Select a goal type */}
           <Grid2 item xs={12} md={6}>
             <FormControl fullWidth>
               <InputLabel sx={inputLable}>Select a goal type</InputLabel>
               <Select
                 data-testid="goal-type-select"
-                name="type" // Add name to ensure proper handling
+                name="type"
                 value={goalFormData.type}
                 onChange={handleChange}
                 label="Select a goal type"
@@ -120,7 +147,9 @@ const handleGoalError = (error) => {
                 MenuProps={menuPropsStyles}
               >
                 <MenuItem value="sleep">Sleep (Hours)</MenuItem>
-                <MenuItem data-testid="goal-type-weight" value="weight">Weight (lbs)</MenuItem>
+                <MenuItem data-testid="goal-type-weight" value="weight">
+                  Weight (lbs)
+                </MenuItem>
                 <MenuItem value="steps">Steps (Step Count)</MenuItem>
                 <MenuItem value="water">Water Intake (Glasses)</MenuItem>
                 <MenuItem value="exercise">Exercise (Minutes)</MenuItem>
@@ -156,9 +185,14 @@ const handleGoalError = (error) => {
           </Grid2>
         </Grid2>
       </form>
-      {errorMessage && <p style={{ color: '#E95D5C', fontWeight: "bold"}}>{errorMessage}</p>}
-      {successMessage && <p style={{ color: '#008000', fontWeight: "bold" }}>{successMessage}</p>}
+      {errorMessage && (
+        <p style={{ color: "#E95D5C", fontWeight: "bold" }}>{errorMessage}</p>
+      )}
+      {successMessage && (
+        <p style={{ color: "#008000", fontWeight: "bold" }}>{successMessage}</p>
+      )}
     </Box>
   );
 }
+
 export default CreateGoal;
diff --git a/code/server/controllers/goalController.js b/code/server/controllers/goalController.js
index bff139c17..69c262b6e 100644
--- a/code/server/controllers/goalController.js
+++ b/code/server/controllers/goalController.js
@@ -1,11 +1,33 @@
 // controllers/goalController.js
 const Goal = require('../models/Goal');
+const jwt = require('jsonwebtoken');
 
 // Create a new goal
 exports.createGoal = async (req, res) => {
   try {
     const { type, targetValue } = req.body;
 
+    // Get token from Authorization header
+    const authHeader = req.headers['authorization'];
+    if (!authHeader) {
+      return res.status(401).json({ message: 'Authorization header is missing' });
+    }
+
+    const token = authHeader.split(' ')[1];
+    if (!token) {
+      return res.status(401).json({ message: 'Token is missing' });
+    }
+
+    // Verify and decode the token
+    const secretKey = process.env.SECRET_KEY;
+    if (!secretKey) {
+      return res.status(500).json({ message: 'Secret key is missing in the environment variables' });
+    }
+
+    const decoded = jwt.verify(token, secretKey);
+    const userId = decoded.userId;
+
+    // Goal creation logic
     let lastGoal = await Goal.find().sort({ goalId: -1 }).limit(1);
     let newGoalId = lastGoal.length > 0 ? lastGoal[0].goalId + 1 : 1;
 
@@ -19,12 +41,12 @@ exports.createGoal = async (req, res) => {
       default: unit = 'unknown';
     }
 
-    const newGoal = new Goal({ goalId: newGoalId, type, targetValue, unit });
+    const newGoal = new Goal({ goalId: newGoalId, type, targetValue, unit, userId });
     await newGoal.save();
 
     res.status(201).json({ message: 'New goal created successfully', goalId: newGoalId });
   } catch (error) {
+    console.error("Error creating goal:", error); // Log the actual error
     res.status(500).json({ message: 'Failed to create goal' });
   }
-};
-
+};
\ No newline at end of file
diff --git a/code/server/models/Goal.js b/code/server/models/Goal.js
index 272eac531..030af11c2 100644
--- a/code/server/models/Goal.js
+++ b/code/server/models/Goal.js
@@ -15,6 +15,7 @@ const goalSchema = new Schema({
   unit: { type: String, required: true },
   createdAt: { type: Date, default: Date.now },
   progress: { type: [progressSchema], default: [] },  // Array of progress entries
+  userId: { type: Number, required: false }
 }, {
   collection: 'goals',  // Specify the collection name
 });