diff --git a/frontend/front/src/api/apiSlice.js b/frontend/front/src/api/apiSlice.js
index c785f56f..518146b0 100644
--- a/frontend/front/src/api/apiSlice.js
+++ b/frontend/front/src/api/apiSlice.js
@@ -1,6 +1,7 @@
 import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react";
 
 import { AUTHORIZATION_HEADER } from "../features/login/loginUtils";
+import { transformSurveyorKeys } from "../features/surveyor/surveyorUtils";
 
 const baseUrl = process.env.REACT_APP_API_URL || "http://localhost:3000";
 
@@ -98,6 +99,7 @@ export const apiSlice = createApi({
     // }),
     getSurveyor: builder.query({
       query: (id) => `/surveyors/${id}`,
+      transformResponse: (result) => result && transformSurveyorKeys(result),
       providesTags: (result, error, arg) => [{ type: "Surveyor", id: arg }],
     }),
     createSurveyor: builder.mutation({
@@ -114,6 +116,7 @@ export const apiSlice = createApi({
         method: "PUT",
         body: surveyor,
       }),
+      transformResponse: (result) => result && transformSurveyorKeys(result),
       invalidatesTags: (result, error, arg) => [
         { type: "Surveyor", id: arg.id },
       ],
diff --git a/frontend/front/src/features/login/loginUtils.js b/frontend/front/src/features/login/loginUtils.js
index 663ccff0..a6e9398a 100644
--- a/frontend/front/src/features/login/loginUtils.js
+++ b/frontend/front/src/features/login/loginUtils.js
@@ -43,8 +43,8 @@ export const useLocallyStoredJWT = () => {
 
 export const decodeJwt = (token) => {
   // "sub" = "subject", aka the user id
-  const { sub, email, role } = jwt_decode(token);
-  return { id: sub, email, role };
+  const { surveyorId, sub, email, role } = jwt_decode(token);
+  return { id: surveyorId, userId: sub, email, role };
 };
 
 export const generatePassword = () =>
diff --git a/frontend/front/src/features/surveyor/surveyorUtils.js b/frontend/front/src/features/surveyor/surveyorUtils.js
new file mode 100644
index 00000000..d1cafc97
--- /dev/null
+++ b/frontend/front/src/features/surveyor/surveyorUtils.js
@@ -0,0 +1,15 @@
+/*
+ * Transform backend surveyor keys to match surveyor form name fields
+ */
+export const transformSurveyorKeys = (data) => {
+  if (!data) return null;
+
+  const { firstname, lastname, street_address, zipcode, ...rest } = data;
+  return {
+    ...rest,
+    firstName: firstname,
+    lastName: lastname,
+    streetAddress: street_address,
+    zipCode: zipcode,
+  };
+};
diff --git a/frontend/front/src/pages/Admin/user/UserProfile.js b/frontend/front/src/pages/Admin/user/UserProfile.js
index 04dd7354..977b5198 100644
--- a/frontend/front/src/pages/Admin/user/UserProfile.js
+++ b/frontend/front/src/pages/Admin/user/UserProfile.js
@@ -41,7 +41,6 @@ const UserProfile = () => {
     defaultValues: {
       firstName: "",
       lastName: "",
-      email: "",
       phone: "",
       streetAddress: "",
       city: "",
@@ -57,10 +56,10 @@ const UserProfile = () => {
       ...surveyorData,
       firstname: data.firstName,
       lastname: data.lastName,
-      email: data.email,
       phone: data.phone,
-      street_address: data.street_address,
+      street_address: data.streetAddress,
       city: data.city,
+      zipcode: data.zipCode,
     };
     updateSurveyor(newSurveyorData)
       .unwrap()
@@ -127,13 +126,12 @@ const UserProfile = () => {
   useEffect(() => {
     if (surveyorData) {
       reset({
-        firstName: surveyorData.firstname,
-        lastName: surveyorData.lastname,
-        email: surveyorData.email,
+        firstName: surveyorData.firstName,
+        lastName: surveyorData.lastName,
         phone: surveyorData.phone,
-        streetAddress: surveyorData.street_address,
+        streetAddress: surveyorData.streetAddress,
         city: surveyorData.city,
-        zipCode: surveyorData.zipcode,
+        zipCode: surveyorData.zipCode,
         state: surveyorData.state,
       });
     }
@@ -226,9 +224,11 @@ const UserProfile = () => {
             title="Confirm Deactivation"
             message="Please confirm to deactivate this user."
           />
-          <Box maxWidth={500} mt={5}>
-            <Box sx={{ bgcolor: "primary.main", color: "white" }} p={1}>
-              <Typography variant="h5">User Profile: {uid}</Typography>
+          <Box maxWidth={500} my={5} px={2}>
+            <Box sx={{ bgcolor: "primary.main", color: "white" }} p={2}>
+              <Typography variant="h5" mb={1}>
+                User Profile: {surveyorData.email}
+              </Typography>
               <Typography variant="h6">
                 Status: {surveyorData.status}
               </Typography>
@@ -247,7 +247,7 @@ const UserProfile = () => {
                     value={value}
                     label="First Name"
                     variant="standard"
-                    sx={{ width: "95%", mx: 2, mt: 3 }}
+                    sx={{ width: "95%", mx: 1, mt: 3 }}
                   />
                 )}
               />
@@ -261,21 +261,7 @@ const UserProfile = () => {
                     value={value}
                     label="Last Name"
                     variant="standard"
-                    sx={{ width: "95%", mx: 2, mt: 3 }}
-                  />
-                )}
-              />
-              <Controller
-                name={"email"}
-                control={control}
-                render={({ field: { onChange, value } }) => (
-                  <TextField
-                    disabled={!editMode}
-                    onChange={onChange}
-                    value={value}
-                    label="Email"
-                    variant="standard"
-                    sx={{ width: "95%", mx: 2, mt: 3 }}
+                    sx={{ width: "95%", mx: 1, mt: 3 }}
                   />
                 )}
               />
@@ -286,10 +272,10 @@ const UserProfile = () => {
                   <TextField
                     disabled={!editMode}
                     onChange={onChange}
-                    value={surveyorData?.phone || value}
+                    value={value}
                     label="Phone"
                     variant="standard"
-                    sx={{ width: "95%", mx: 2, mt: 3 }}
+                    sx={{ width: "95%", mx: 1, mt: 3 }}
                   />
                 )}
               />
@@ -303,7 +289,7 @@ const UserProfile = () => {
                     value={value}
                     label="Street Address"
                     variant="standard"
-                    sx={{ width: "95%", mx: 2, mt: 3 }}
+                    sx={{ width: "95%", mx: 1, mt: 3 }}
                   />
                 )}
               />
@@ -317,35 +303,35 @@ const UserProfile = () => {
                     value={value}
                     label="City"
                     variant="standard"
-                    sx={{ width: "95%", mx: 2, mt: 3 }}
+                    sx={{ width: "95%", mx: 1, mt: 3 }}
                   />
                 )}
               />
               <Controller
-                name={"zipCode"}
+                name={"state"}
                 control={control}
                 render={({ field: { onChange, value } }) => (
                   <TextField
                     disabled={!editMode}
                     onChange={onChange}
                     value={value}
-                    label="Zip Code"
+                    label="State"
                     variant="standard"
-                    sx={{ width: "95%", mx: 2, mt: 3 }}
+                    sx={{ width: "95%", mx: 1, mt: 3 }}
                   />
                 )}
               />
               <Controller
-                name={"state"}
+                name={"zipCode"}
                 control={control}
                 render={({ field: { onChange, value } }) => (
                   <TextField
                     disabled={!editMode}
                     onChange={onChange}
                     value={value}
-                    label="State"
+                    label="Zip Code"
                     variant="standard"
-                    sx={{ width: "95%", mx: 2, mt: 3 }}
+                    sx={{ width: "95%", mx: 1, mt: 3 }}
                   />
                 )}
               />
diff --git a/frontend/front/src/pages/Surveyor/Components/EditAccount.js b/frontend/front/src/pages/Surveyor/Components/EditAccount.js
new file mode 100644
index 00000000..a1c0f3e5
--- /dev/null
+++ b/frontend/front/src/pages/Surveyor/Components/EditAccount.js
@@ -0,0 +1,254 @@
+import { useForm } from "react-hook-form";
+import { useNavigate } from "react-router-dom";
+import { Box, Button, Grid, Paper, TextField } from "@mui/material";
+import CustomSnackbar from "../../../components/CustomSnackbar";
+import { SURVEYOR_DASHBOARD_ROUTE } from "../../../routing/routes";
+import { useUpdateSurveyorMutation } from "../../../api/apiSlice";
+import {
+  validatePhoneNumber,
+  validateZipCode,
+} from "../../../util/stringUtils";
+
+const EditAccount = ({ surveyorData }) => {
+  const { firstName, lastName, phone, streetAddress, city, zipCode, state } =
+    surveyorData;
+  const navigate = useNavigate();
+  const {
+    register,
+    handleSubmit,
+    formState: { errors, isDirty },
+    reset,
+  } = useForm({
+    defaultValues: {
+      firstName,
+      lastName,
+      phone,
+      streetAddress,
+      city,
+      zipCode,
+      state,
+    },
+  });
+
+  const paperStyle = {
+    padding: 40,
+    display: "flex",
+    flexDirection: "column",
+    width: 280,
+    margin: "20px auto",
+  };
+
+  const btnstyle = { margin: "10px 0" };
+
+  const [
+    updateSurveyor,
+    {
+      isLoading: updateSurveyorProg,
+      isSuccess: updateSurveyorSuccess,
+      isError: updateSurveyorError,
+    },
+  ] = useUpdateSurveyorMutation();
+
+  async function EditAccountForms(values) {
+    if (!values) return;
+    const newSurveyorData = {
+      ...surveyorData,
+      firstname: values.firstName,
+      lastname: values.lastName,
+      phone: values.phone,
+      street_address: values.streetAddress,
+      city: values.city,
+      zipcode: values.zipCode,
+    };
+    const updatedSurveyorData = await updateSurveyor(newSurveyorData).unwrap();
+    if (updatedSurveyorData) {
+      reset({
+        firstName: updatedSurveyorData.firstName,
+        lastName: updatedSurveyorData.lastName,
+        phone: updatedSurveyorData.phone,
+        streetAddress: updatedSurveyorData.streetAddress,
+        city: updatedSurveyorData.city,
+        zipCode: updatedSurveyorData.zipCode,
+        state: updatedSurveyorData.state,
+      });
+    }
+  }
+  return (
+    <Box>
+      <Paper elevation={5} style={paperStyle}>
+        <Grid align="center">
+          <h2>Update Account Details?</h2>
+        </Grid>
+
+        <form onSubmit={handleSubmit(EditAccountForms)}>
+          <TextField
+            id="account-first-name"
+            placeholder="Enter First Name"
+            type="text"
+            style={btnstyle}
+            name="firstName"
+            fullWidth
+            label="First Name"
+            variant="standard"
+            defaultValue={firstName}
+            {...register("firstName", {
+              required: {
+                value: true,
+                message: "Please Enter First Name",
+              },
+            })}
+            error={!!errors?.firstName}
+            helperText={!!errors?.firstName && errors?.firstName?.message}
+          />
+          <TextField
+            id="account-last-name"
+            placeholder="Enter Last Name"
+            type="text"
+            style={btnstyle}
+            name="lastName"
+            fullWidth
+            label="Last Name"
+            variant="standard"
+            defaultValue={lastName}
+            {...register("lastName", {
+              required: {
+                value: true,
+                message: "Please Enter Last Name",
+              },
+            })}
+            error={!!errors?.lastName}
+            helperText={!!errors?.lastName && errors?.lastName?.message}
+          />
+          <TextField
+            id="account-phone-number"
+            placeholder="Enter Phone Number"
+            type="tel"
+            style={btnstyle}
+            name="phone"
+            fullWidth
+            label="Phone Number"
+            variant="standard"
+            defaultValue={phone}
+            {...register("phone", {
+              required: "Phone number is required",
+              validate: validatePhoneNumber,
+            })}
+            error={!!errors?.phone}
+            helperText={!!errors?.phone && errors?.phone?.message}
+          />
+          <TextField
+            id="account-street-address"
+            placeholder="Enter Street Address"
+            type="text"
+            style={btnstyle}
+            name="streetAddress"
+            fullWidth
+            label="Street Address"
+            variant="standard"
+            defaultValue={streetAddress}
+            {...register("streetAddress", {
+              required: {
+                value: true,
+                message: "Please Enter Street Address",
+              },
+            })}
+            error={!!errors?.streetAddress}
+            helperText={
+              !!errors?.streetAddress && errors?.streetAddress?.message
+            }
+          />
+          <TextField
+            id="account-state"
+            placeholder="Enter State"
+            type="text"
+            style={btnstyle}
+            name="state"
+            fullWidth
+            label="State"
+            variant="standard"
+            defaultValue={state}
+            {...register("state", {
+              required: {
+                value: true,
+                message: "Please Enter State",
+              },
+            })}
+            error={!!errors?.state}
+            helperText={!!errors?.state && errors?.state?.message}
+          />
+          <TextField
+            id="account-zip-code"
+            placeholder="Enter Zip Code"
+            type="text"
+            style={btnstyle}
+            name="zipCode"
+            fullWidth
+            label="Zip Code"
+            variant="standard"
+            defaultValue={zipCode}
+            {...register("zipCode", {
+              required: "Please Enter Zip Code",
+              validate: validateZipCode,
+            })}
+            error={!!errors?.zipCode}
+            helperText={!!errors?.zipCode && errors?.zipCode?.message}
+          />
+          <Button
+            type="submit"
+            color="primary"
+            variant="contained"
+            onClick={() => EditAccountForms}
+            style={{
+              btnstyle,
+              borderRadius: "20px",
+              marginTop: "20px",
+            }}
+            fullWidth
+            disabled={
+              !isDirty || updateSurveyorProg || Object.keys(errors).length > 0
+            }
+          >
+            Save
+          </Button>
+          <Button
+            type="button"
+            color="error"
+            variant="contained"
+            onClick={() =>
+              isDirty
+                ? reset({
+                    firstName,
+                    lastName,
+                    phone,
+                    streetAddress,
+                    city,
+                    zipCode,
+                    state,
+                  })
+                : navigate(SURVEYOR_DASHBOARD_ROUTE)
+            }
+            style={{
+              btnstyle,
+              borderRadius: "20px",
+              marginTop: "20px",
+            }}
+            fullWidth
+          >
+            Cancel
+          </Button>
+        </form>
+        {updateSurveyorSuccess && (
+          <CustomSnackbar
+            severity="success"
+            message="Account updated successfully!"
+          />
+        )}
+        {updateSurveyorError && (
+          <CustomSnackbar severity="error" message="Error updating account!" />
+        )}
+      </Paper>
+    </Box>
+  );
+};
+
+export default EditAccount;
diff --git a/frontend/front/src/pages/Surveyor/SurveyorContainer.js b/frontend/front/src/pages/Surveyor/SurveyorContainer.js
index 22f4cdfd..eaebe7d6 100644
--- a/frontend/front/src/pages/Surveyor/SurveyorContainer.js
+++ b/frontend/front/src/pages/Surveyor/SurveyorContainer.js
@@ -11,7 +11,6 @@ import {
 import { ProtectedInactive } from "../../routing/ProtectedInactive";
 import InactiveSurveyor from "./Components/InactiveSurveyor";
 import Account from "./account/Account";
-import EditAccount from "./account/edit/EditAccount";
 import Dashboard from "./dashboard/Dashboard";
 import HouseProfile from "./houseProfile/HouseProfile";
 import Nav from "./nav/Nav";
@@ -32,7 +31,6 @@ const SurveyorContainer = () => {
           >
             <Route path="dashboard" element={<Dashboard />}></Route>
             <Route path="account" element={<Account />}></Route>
-            <Route path="account/edit" element={<EditAccount />}></Route>
             <Route path="house/:id" element={<HouseProfile />}></Route>
             <Route
               path="survey/:uid"
diff --git a/frontend/front/src/pages/Surveyor/account/Account.js b/frontend/front/src/pages/Surveyor/account/Account.js
index 1bb20ddc..f7aa4965 100644
--- a/frontend/front/src/pages/Surveyor/account/Account.js
+++ b/frontend/front/src/pages/Surveyor/account/Account.js
@@ -1,46 +1,34 @@
-import { Box, Button, Stack } from "@mui/material";
-
 import React from "react";
 import { useSelector } from "react-redux";
-import { Link } from "react-router-dom";
-import ContainerTitle from "../../Admin/component/ContainerTitle";
 import { BackButton } from "../Components/BackButton";
-import AccountDetail from "./AccountDetail";
+import { useGetSurveyorQuery } from "../../../api/apiSlice";
+import { selectCurrentUser } from "../../../features/login/loginSlice";
+import Loader from "../../../components/Loader";
+import CustomSnackbar from "../../../components/CustomSnackbar";
+import EditAccount from "../Components/EditAccount";
 
 const Account = () => {
-  const { firstName, lastName, email, address, phoneNumber } = useSelector(
-    (state) => state.account
-  );
+  const currentUser = useSelector(selectCurrentUser);
+  const {
+    data: surveyorData,
+    isLoading: isSurveyorDataLoading,
+    isError: isSurveyorError,
+  } = useGetSurveyorQuery(currentUser.id);
+
   return (
     <>
       <BackButton url="/surveyor/dashboard" description="dashboard" />
-      <ContainerTitle name="My Account">
-        <Stack direction="column" gap={1}>
-          <AccountDetail label="First Name" value={firstName} />
-          <AccountDetail label="Last Name" value={lastName} />
-          <AccountDetail label="Email" value={email} />
-          <AccountDetail label="Address" value={address} />
-          <AccountDetail label="Phone Number" value={phoneNumber} />
-        </Stack>
-
-        <Stack direction="column">
-          <Box display="flex" mt={3} mb={2} px={2}>
-            <Button variant="contained" component={Link} to="edit">
-              Edit
-            </Button>
-          </Box>
-          {/*
-          <Box p={1} sx={{ borderBottom: "1px dashed grey" }} />
-          <Box display="flex" mt={3} mb={2} px={2}>
-            
-            --Feature will not implemented on backend
-            <Button variant="contained" disabled={true}>
-              Request New Assignment
-            </Button>
-          </Box>
-  */}
-        </Stack>
-      </ContainerTitle>
+      {isSurveyorDataLoading ? (
+        <Loader />
+      ) : !surveyorData || isSurveyorError ? (
+        <CustomSnackbar
+          open={isSurveyorError}
+          message="Error fetching surveyor data."
+          severity="error"
+        />
+      ) : (
+        <EditAccount surveyorData={surveyorData} />
+      )}
     </>
   );
 };
diff --git a/frontend/front/src/pages/Surveyor/account/edit/EditAccount.js b/frontend/front/src/pages/Surveyor/account/edit/EditAccount.js
deleted file mode 100644
index 8834b592..00000000
--- a/frontend/front/src/pages/Surveyor/account/edit/EditAccount.js
+++ /dev/null
@@ -1,207 +0,0 @@
-import React from "react";
-import Button from "@mui/material/Button";
-import { Grid, Paper, TextField, Box } from "@mui/material";
-import { useForm } from "react-hook-form";
-import { useDispatch, useSelector } from "react-redux";
-import { setAccount } from "../../../../features/account/accountSlice";
-import { useNavigate, Link } from "react-router-dom";
-
-const EditAccount = () => {
-  const dispatch = useDispatch();
-  const navigate = useNavigate();
-
-  const {
-    register,
-    handleSubmit,
-    formState: { errors },
-    reset,
-  } = useForm();
-
-  const { firstName, lastName, email, address, phoneNumber } = useSelector(
-    (state) => state.account
-  );
-
-  const paperStyle = {
-    padding: 40,
-
-    display: "flex",
-    flexDirection: "column",
-    width: 280,
-    margin: "20px auto",
-  };
-
-  const btnstyle = { margin: "10px 0" };
-
-  const errorStyles = {
-    color: "rgb(239 68 68 / 1)",
-    fontSize: "0.875rem",
-    lineHeight: "1.25rem",
-  };
-
-  async function EditAccountForms(values) {
-    if (!values) return;
-
-    dispatch(
-      setAccount({
-        firstName: values.firstName,
-        lastName: values.lastName,
-        email: values.email,
-        address: values.address,
-        phoneNumber: values.phoneNumber,
-      })
-    );
-
-    reset();
-
-    navigate("../account");
-  }
-
-  return (
-    <Box>
-      <Paper elevation={5} style={paperStyle}>
-        <Grid align="center">
-          <h2>Update Account Details?</h2>
-        </Grid>
-
-        <form onSubmit={handleSubmit(EditAccountForms)}>
-          <TextField
-            id="standard-basic"
-            placeholder="Enter First Name"
-            type="text"
-            style={btnstyle}
-            name="firstName"
-            fullWidth
-            label="First Name"
-            variant="standard"
-            defaultValue={firstName}
-            {...register("firstName", {
-              required: {
-                value: true,
-                message: "Please Enter First Name",
-              },
-            })}
-          />
-          <span style={errorStyles}>{errors?.firstName?.message}</span>
-          <TextField
-            id="standard-basic"
-            placeholder="Enter Last Name"
-            type="text"
-            style={btnstyle}
-            name="lastName"
-            fullWidth
-            label="Last Name"
-            variant="standard"
-            defaultValue={lastName}
-            {...register("lastName", {
-              required: {
-                value: true,
-                message: "Please Enter Last Name",
-              },
-            })}
-          />
-          <span style={errorStyles}>{errors?.lastName?.message}</span>
-          <TextField
-            id="standard-basic"
-            placeholder="Enter Email"
-            type="email"
-            style={btnstyle}
-            name="email"
-            fullWidth
-            label="Email"
-            variant="standard"
-            defaultValue={email}
-            {...register("email", {
-              required: {
-                value: true,
-                message: "Please Enter Email",
-              },
-              pattern: {
-                value:
-                  /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
-                message: "Please enter a valid email",
-              },
-            })}
-          />
-          <span style={errorStyles}>{errors?.email?.message}</span>
-          <TextField
-            id="standard-basic"
-            placeholder="Enter Address"
-            type="text"
-            style={btnstyle}
-            name="address"
-            fullWidth
-            label="Address"
-            variant="standard"
-            defaultValue={address}
-            {...register("address", {
-              required: {
-                value: true,
-                message: "Please Enter Address",
-              },
-            })}
-          />
-          <span style={errorStyles}>{errors?.address?.message}</span>
-          <TextField
-            id="standard-basic"
-            placeholder="Enter Phone Number"
-            type="tel"
-            style={btnstyle}
-            name="phoneNumber"
-            fullWidth
-            label="Phone Number"
-            variant="standard"
-            defaultValue={phoneNumber}
-            {...register("phoneNumber", {
-              required: {
-                value: true,
-                message: "Please Enter Phone Number",
-              },
-              maxLength: {
-                value: 11,
-                message: "Phone number too long",
-              },
-              minLength: {
-                value: 8,
-                message: "Phone number too short",
-              },
-            })}
-          />
-          <span style={errorStyles}>{errors?.phoneNumber?.message}</span>
-
-          <Button
-            type="submit"
-            color="primary"
-            variant="contained"
-            onClick={() => EditAccountForms}
-            style={{
-              btnstyle,
-              borderRadius: "20px",
-              marginTop: "20px",
-            }}
-            fullWidth
-          >
-            Save
-          </Button>
-          <Button
-            type="button"
-            color="error"
-            variant="contained"
-            onClick={() => EditAccountForms}
-            style={{
-              btnstyle,
-              borderRadius: "20px",
-              marginTop: "20px",
-            }}
-            fullWidth
-            component={Link}
-            to="../account"
-          >
-            Cancel
-          </Button>
-        </form>
-      </Paper>
-    </Box>
-  );
-};
-
-export default EditAccount;
diff --git a/frontend/front/src/util/stringUtils.js b/frontend/front/src/util/stringUtils.js
index 545360f6..d76f9b05 100644
--- a/frontend/front/src/util/stringUtils.js
+++ b/frontend/front/src/util/stringUtils.js
@@ -28,3 +28,26 @@ export const isPasswordValid = (password) => {
     };
   }
 };
+
+export const validatePhoneNumber = (value) => {
+  const digitsOnly = value.replace(/\D/g, "");
+  if (
+    (digitsOnly.length === 11 && digitsOnly.startsWith("1")) ||
+    digitsOnly.length === 10
+  ) {
+    const validCharacters = /^[0-9()\-\s]+$/;
+    if (validCharacters.test(value)) {
+      return true;
+    }
+  }
+
+  return "Invalid phone number format";
+};
+
+export const validateZipCode = (value) => {
+  const zipPattern = /^\d{5}(-\d{4})?$/;
+  if (!zipPattern.test(value)) {
+    return "Invalid zip code format";
+  }
+  return true;
+};