diff --git a/src/actions/userManagement.js b/src/actions/userManagement.js
index 09da5f1a83..9eb5685fd1 100644
--- a/src/actions/userManagement.js
+++ b/src/actions/userManagement.js
@@ -263,9 +263,7 @@ export const updateUserFinalDayStatusIsSet = (user, status, finalDayDate, isSet)
       // Prepare patch data
       const patchData = {
         status,
-        endDate: finalDayDate
-          ? moment.utc(finalDayDate).format('YYYY-MM-DD')
-          : undefined,
+        endDate: finalDayDate ?? undefined,
         isSet,
       };
 
diff --git a/src/components/UserManagement/SetUpFinalDayButton.jsx b/src/components/UserManagement/SetUpFinalDayButton.jsx
index 46ea17cfa5..ea46706f69 100644
--- a/src/components/UserManagement/SetUpFinalDayButton.jsx
+++ b/src/components/UserManagement/SetUpFinalDayButton.jsx
@@ -6,6 +6,7 @@ import { boxStyle } from '../../styles';
 import SetUpFinalDayPopUp from './SetUpFinalDayPopUp';
 import { SET_FINAL_DAY, CANCEL } from '../../languages/en/ui';
 import { FinalDay } from '../../utils/enums';
+import { formatEndDatePST } from '../../utils/formatDate';
 
 function SetUpFinalDayButton(props) {
   const { darkMode, userProfile, onFinalDaySave } = props;
@@ -40,11 +41,13 @@ function SetUpFinalDayButton(props) {
   };
 
   const handleSaveFinalDay = async (finalDayDate) => {
+    
+    const finalInstant = formatEndDatePST(finalDayDate);
     try {
       await updateUserFinalDayStatusIsSet(
         userProfile,
         'Active',
-        finalDayDate,
+        finalInstant,
         FinalDay.FinalDay,
       )(dispatch);
 
diff --git a/src/components/UserManagement/UserTableData.jsx b/src/components/UserManagement/UserTableData.jsx
index f7a2ff7a3e..1b3034b6e4 100644
--- a/src/components/UserManagement/UserTableData.jsx
+++ b/src/components/UserManagement/UserTableData.jsx
@@ -14,7 +14,7 @@ import { UserStatus } from '../../utils/enums';
 import ActiveCell from './ActiveCell';
 import TimeDifference from './TimeDifference';
 import { boxStyle } from '../../styles';
-import { formatDateLocal, formatDateUtcYYYYMMDD } from '../../utils/formatDate';
+import { formatDateLocal, formatDateUtcYYYYMMDD, formatEndDatePST } from '../../utils/formatDate';
 import hasPermission, {cantUpdateDevAdminDetails } from '../../utils/permissions';
 import SetUpFinalDayButton from './SetUpFinalDayButton';
 
@@ -42,7 +42,7 @@ const UserTableDataComponent = (props) => {
     email: props.user.email,
     weeklycommittedHours: props.user.weeklycommittedHours,
     startDate: formatDateUtcYYYYMMDD(props.user.startDate) || '',
-    endDate: formatDateUtcYYYYMMDD(props.user.endDate) || '',
+    endDate: formatEndDatePST(props.user.endDate) || '',
   });
   const dispatch = useDispatch();
   const history = useHistory();
@@ -98,7 +98,7 @@ const UserTableDataComponent = (props) => {
       email: props.user.email,
       weeklycommittedHours: props.user.weeklycommittedHours,
       startDate: formatDateUtcYYYYMMDD(props.user.startDate),
-      endDate: formatDateUtcYYYYMMDD(props.user.endDate),
+      endDate: formatEndDatePST(props.user.endDate),
     });
   }, [props.user]);
 
@@ -524,13 +524,13 @@ const UserTableDataComponent = (props) => {
       <td className="email_cell">
         {editUser?.endDate ? (
           <div>
-            {props.user.endDate ? formatDateLocal(props.user.endDate) : 'N/A'}
+            {props.user.endDate ? formatEndDatePST(props.user.endDate) : 'N/A'}
             <FontAwesomeIcon
               className="copy_icon"
               icon={faCopy}
               onClick={() => {
                 navigator.clipboard.writeText(
-                  props.user.endDate ? formatDateLocal(formData.endDate) : 'N/A',
+                  props.user.endDate ? formatEndDatePST(formData.endDate) : 'N/A',
                 );
                 toast.success('End Date Copied!');
               }}
diff --git a/src/components/UserProfile/BasicInformationTab/BasicInformationTab.jsx b/src/components/UserProfile/BasicInformationTab/BasicInformationTab.jsx
index 2395cd74a8..9270dfb5ff 100644
--- a/src/components/UserProfile/BasicInformationTab/BasicInformationTab.jsx
+++ b/src/components/UserProfile/BasicInformationTab/BasicInformationTab.jsx
@@ -16,7 +16,7 @@ import SetUpFinalDayButton from '~/components/UserManagement/SetUpFinalDayButton
 import './BasicInformationTab.css';
 import { boxStyle, boxStyleDark } from '~/styles';
 import EditableInfoModal from '~/components/UserProfile/EditableModal/EditableInfoModal';
-import { formatDateLocal } from '~/utils/formatDate';
+import { formatEndDatePST, formatDateLocal } from '~/utils/formatDate';
 import { ENDPOINTS } from '~/utils/URL';
 import axios from 'axios';
 import { isString } from 'lodash';
@@ -911,6 +911,10 @@ const BasicInformationTab = props => {
     </>
   );
 
+  const handleFinalDayChange = (updatedUser) => {
+  setUserProfile(updatedUser);
+};
+
   const endDateComponent = (
     <>
       <Col md={desktopDisplay ? '5' : ''}>
@@ -922,7 +926,7 @@ const BasicInformationTab = props => {
         <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
           <Label className={darkMode ? 'text-light' : ''} style={{ margin: '0' }}>
             {userProfile.endDate
-              ? formatDateLocal(userProfile.endDate)
+              ? formatEndDatePST(userProfile.endDate)
               : 'N/A'}
           </Label>
           {canEdit && canEditEndDate && (
@@ -932,6 +936,7 @@ const BasicInformationTab = props => {
               isBigBtn={true}
               userProfile={userProfile}
               darkMode={darkMode}
+              onFinalDaySave={handleFinalDayChange}
             />
           )}
         </div>
diff --git a/src/utils/formatDate.js b/src/utils/formatDate.js
index 814de1cb78..cd9736d0c8 100644
--- a/src/utils/formatDate.js
+++ b/src/utils/formatDate.js
@@ -30,6 +30,13 @@ export const formatDateUtcYYYYMMDD = (val) => {
   return moment(val, moment.ISO_8601, true).utc().format('YYYY-MM-DD');
 };
 
+export const formatEndDatePST = (selectedDateString) => {
+  return moment
+    .tz(selectedDateString, LA_TIME_ZONE)       // interpret date as LA/PST
+    .endOf('day')                        // set 23:59:59.999
+    .toDate();                           // convert to UTC ISO for DB
+}
+
 /**
  *
  * @param {*} date UTC timestamp string