diff --git a/api/app/Generators/ApplicationDocGenerator.php b/api/app/Generators/ApplicationDocGenerator.php
index d928254cc5d..cd9ca5d944b 100644
--- a/api/app/Generators/ApplicationDocGenerator.php
+++ b/api/app/Generators/ApplicationDocGenerator.php
@@ -93,7 +93,6 @@ public function generate(): self
                     $this->status($section, $user);
                     $this->languageInfo($section, $user);
                     $this->governmentInfo($section, $user);
-                    $this->workLocation($section, $user);
                     $this->workPreferences($section, $user);
                     $this->dei($section, $user);
 
diff --git a/api/app/Generators/PoolCandidateCsvGenerator.php b/api/app/Generators/PoolCandidateCsvGenerator.php
index 1405a8adeea..e0ec781c46d 100644
--- a/api/app/Generators/PoolCandidateCsvGenerator.php
+++ b/api/app/Generators/PoolCandidateCsvGenerator.php
@@ -72,10 +72,10 @@ class PoolCandidateCsvGenerator extends CsvGenerator implements FileGeneratorInt
         'current_classification',
         'priority_entitlement',
         'priority_number',
-        'location_preferences',
-        'location_exemptions',
         'accept_temporary',
         'accepted_operational_requirements',
+        'location_preferences',
+        'location_exemptions',
         'woman',
         'indigenous',
         'visible_minority',
@@ -143,10 +143,10 @@ public function generate(): self
                     $candidate->user->getClassification(), // Current classification
                     $this->yesOrNo($candidate->user->has_priority_entitlement), // Priority entitlement
                     $candidate->user->priority_number ?? '', // Priority number
-                    $this->localizeEnumArray($candidate->user->location_preferences, WorkRegion::class),
-                    $candidate->user->location_exemptions, // Location exemptions
                     $candidate->user->position_duration ? $this->yesOrNo($candidate->user->wouldAcceptTemporary()) : '', // Accept temporary
                     $this->localizeEnumArray($preferences['accepted'], OperationalRequirement::class),
+                    $this->localizeEnumArray($candidate->user->location_preferences, WorkRegion::class),
+                    $candidate->user->location_exemptions, // Location exemptions
                     $this->yesOrNo($candidate->user->is_woman), // Woman
                     $this->localizeEnumArray($candidate->user->indigenous_communities, IndigenousCommunity::class),
                     $this->yesOrNo($candidate->user->is_visible_minority), // Visible minority
diff --git a/api/app/Generators/UserCsvGenerator.php b/api/app/Generators/UserCsvGenerator.php
index ddb797d2762..1e94aef512b 100644
--- a/api/app/Generators/UserCsvGenerator.php
+++ b/api/app/Generators/UserCsvGenerator.php
@@ -47,10 +47,10 @@ class UserCsvGenerator extends CsvGenerator implements FileGeneratorInterface
         'current_classification',
         'priority_entitlement',
         'priority_number',
-        'location_preferences',
-        'location_exemptions',
         'accept_temporary',
         'accepted_operational_requirements',
+        'location_preferences',
+        'location_exemptions',
         'woman',
         'indigenous',
         'visible_minority',
@@ -107,10 +107,10 @@ public function generate(): self
                     $user->getClassification(), // Current classification
                     $this->yesOrNo($user->has_priority_entitlement), // Priority entitlement
                     $user->priority_number ?? '', // Priority number
-                    $this->localizeEnumArray($user->location_preferences, WorkRegion::class),
-                    $user->location_exemptions, // Location exemptions
                     $user->position_duration ? $this->yesOrNo($user->wouldAcceptTemporary()) : '', // Accept temporary
                     $this->localizeEnumArray($preferences['accepted'], OperationalRequirement::class),
+                    $this->localizeEnumArray($user->location_preferences, WorkRegion::class),
+                    $user->location_exemptions, // Location exemptions
                     $this->yesOrNo($user->is_woman), // Woman
                     $this->localizeEnumArray($indigenousCommunities, IndigenousCommunity::class),
                     $this->yesOrNo($user->is_visible_minority), // Visible minority
diff --git a/api/app/Traits/Generator/GeneratesUserDoc.php b/api/app/Traits/Generator/GeneratesUserDoc.php
index 252a0e8a15d..5418ab7814d 100644
--- a/api/app/Traits/Generator/GeneratesUserDoc.php
+++ b/api/app/Traits/Generator/GeneratesUserDoc.php
@@ -57,7 +57,6 @@ protected function contactInfo(Section $section, User $user, $headingRank = 3)
         $section->addTitle($this->localizeHeading('contact_info'), $headingRank);
         $this->addLabelText($section, $this->localizeHeading('email'), $user->email);
         $this->addLabelText($section, $this->localizeHeading('phone'), $user->telephone);
-        $this->addLabelText($section, $this->localizeHeading('current_city'), $this->currentLocation($user));
         $this->addLabelText($section, $this->localizeHeading('preferred_communication_language'), $this->localizeEnum($user->preferred_lang, Language::class));
         $this->addLabelText($section, $this->localizeHeading('preferred_spoken_interview_language'), $this->localizeEnum($user->preferred_language_for_interview, Language::class));
         $this->addLabelText($section, $this->localizeHeading('preferred_written_exam_language'), $this->localizeEnum($user->preferred_language_for_exam, Language::class));
@@ -161,19 +160,6 @@ protected function governmentInfo(Section $section, User $user, $headingRank = 4
         }
     }
 
-    /**
-     * Generate information about a users work location
-     *
-     * @param  Section  $section  The section to add info to
-     * @param  User  $user  The user being generated
-     */
-    protected function workLocation(Section $section, User $user, $headingRank = 4)
-    {
-        $section->addTitle($this->localizeHeading('work_location'), $headingRank);
-        $this->addLabelText($section, $this->localizeHeading('work_location'), $this->localizeEnumArray($user->location_preferences, WorkRegion::class));
-        $this->addLabelText($section, $this->localizeHeading('location_exemptions'), $user->location_exemptions ?? '');
-    }
-
     /**
      * Generate information about a users work preferences
      *
@@ -183,6 +169,8 @@ protected function workLocation(Section $section, User $user, $headingRank = 4)
     protected function workPreferences(Section $section, User $user, $headingRank = 4)
     {
         $section->addTitle($this->localizeHeading('work_preferences'), $headingRank);
+
+        $section->addText($this->localizeHeading('contract_duration'), $this->strong);
         foreach ($user?->position_duration ?? [] as $duration) {
             $section->addListItem($this->localizeEnum($duration, PositionDuration::class));
         }
@@ -196,13 +184,12 @@ protected function workPreferences(Section $section, User $user, $headingRank =
             }
         }
 
-        if (count($preferences['not_accepted']) > 0) {
-            $section->addText($this->localizeHeading('rejected_operational_requirements'), $this->strong);
+        $section->addText($this->localizeHeading('current_location'), $this->strong);
+        $this->addLabelText($section, $this->localizeHeading('current_city'), $this->currentLocation($user));
 
-            foreach ($preferences['not_accepted'] as $preference) {
-                $section->addListItem($this->localizeEnum($preference, OperationalRequirement::class, 'long'));
-            }
-        }
+        $section->addText($this->localizeHeading('location_preferences'), $this->strong);
+        $this->addLabelText($section, $this->localizeHeading('work_location'), $this->localizeEnumArray($user->location_preferences, WorkRegion::class));
+        $this->addLabelText($section, $this->localizeHeading('location_exemptions'), $user->location_exemptions ?? '');
     }
 
     /**
@@ -374,7 +361,6 @@ protected function generateUser(Section $section, User $user, $headingRank = 2)
         $this->status($section, $user, $headingRank + 2);
         $this->languageInfo($section, $user, $headingRank + 2);
         $this->governmentInfo($section, $user, $headingRank + 2);
-        $this->workLocation($section, $user, $headingRank + 2);
         $this->workPreferences($section, $user, $headingRank + 2);
         $this->dei($section, $user, $headingRank + 2);
 
diff --git a/api/lang/en/headings.php b/api/lang/en/headings.php
index fd2aec2e61f..59f1a8f7a98 100644
--- a/api/lang/en/headings.php
+++ b/api/lang/en/headings.php
@@ -9,6 +9,7 @@
     'notes' => 'Notes',
     'current_province' => 'Province',
     'current_city' => 'City',
+    'current_location' => 'Current location',
     'date_received' => 'Date received',
     'expiry_date' => 'Expiry date',
     'archival_date' => 'Archival date',
@@ -36,10 +37,11 @@
     'priority_entitlement' => 'Priority entitlement',
     'priority_number' => 'Priority number',
     'work_location' => 'Work location',
-    'location_preferences' => 'Location preferences',
+    'location_preferences' => 'Work location preferences',
     'location_exemptions' => 'Location exemptions',
+    'contract_duration' => 'Contract duration preference',
     'accept_temporary' => 'Accept temporary',
-    'accepted_operational_requirements' => 'Would consider accepting a job that: ',
+    'accepted_operational_requirements' => 'Acceptable job requirements',
     'rejected_operational_requirements' => 'Would not consider a job that requires: ',
     'woman' => 'Woman',
     'indigenous' => 'Indigenous',
diff --git a/api/lang/fr/headings.php b/api/lang/fr/headings.php
index c5e8b183657..12d1f785b65 100644
--- a/api/lang/fr/headings.php
+++ b/api/lang/fr/headings.php
@@ -9,6 +9,7 @@
     'notes' => 'Notes',
     'current_province' => 'Province actuelle',
     'current_city' => 'Ville',
+    'current_location' => 'Emplacement actuel',
     'date_received' => 'Date de réception',
     'expiry_date' => 'Date d\'expiration',
     'archival_date' => 'Date d\'archivage',
@@ -36,8 +37,9 @@
     'priority_entitlement' => 'Droit de priorité',
     'priority_number' => 'Numéro de priorité',
     'work_location' => 'Lieu de travail',
-    'location_preferences' => 'Préférences de lieux',
+    'location_preferences' => 'Préférences pour le lieu de travail',
     'location_exemptions' => 'Exemptions de lieux',
+    'contract_duration' => 'Préférence pour la durée du contrat',
     'accept_temporary' => 'Accepter les temporaires',
     'accepted_operational_requirements' => 'Envisagerait d\'accepter un emploi qui : ',
     'rejected_operational_requirements' => 'N\'envisagerait pas d\'accepter un emploi qui : ',
diff --git a/apps/playwright/tests/applicant/profile-workflows.spec.ts b/apps/playwright/tests/applicant/profile-workflows.spec.ts
index b5b8bd2cb65..c2b7cac9a14 100644
--- a/apps/playwright/tests/applicant/profile-workflows.spec.ts
+++ b/apps/playwright/tests/applicant/profile-workflows.spec.ts
@@ -14,8 +14,8 @@ test.describe("User Profile", () => {
       "PersonalInformationFormOptions",
     );
     await applicantPage.page
-      .getByRole("textbox", { name: /current city/i })
-      .fill("Test city");
+      .getByRole("textbox", { name: /telephone/i })
+      .fill("123-456-7890");
     await applicantPage.page
       .getByRole("button", { name: /save changes/i })
       .click();
@@ -23,7 +23,7 @@ test.describe("User Profile", () => {
     await expect(applicantPage.page.getByRole("alert").last()).toContainText(
       /information updated successfully/i,
     );
-    await expect(applicantPage.page.getByText(/test city/i)).toBeVisible();
+    await expect(applicantPage.page.getByText("123-456-7890")).toBeVisible();
 
     // Edit work preferences
     await applicantPage.page
diff --git a/apps/web/src/components/Profile/components/PersonalInformation/Display.tsx b/apps/web/src/components/Profile/components/PersonalInformation/Display.tsx
index af817dd9755..8fab9565924 100644
--- a/apps/web/src/components/Profile/components/PersonalInformation/Display.tsx
+++ b/apps/web/src/components/Profile/components/PersonalInformation/Display.tsx
@@ -37,8 +37,6 @@ type PartialUser = Pick<
   | "preferredLang"
   | "preferredLanguageForInterview"
   | "preferredLanguageForExam"
-  | "currentCity"
-  | "currentProvince"
   | "citizenship"
   | "armedForcesStatus"
 >;
@@ -58,8 +56,6 @@ const Display = ({
     preferredLang,
     preferredLanguageForInterview,
     preferredLanguageForExam,
-    currentCity,
-    currentProvince,
     citizenship,
     armedForcesStatus,
   },
@@ -186,28 +182,6 @@ const Display = ({
           notProvided
         )}
       </FieldDisplay>
-      <FieldDisplay
-        hasError={!currentCity}
-        label={intl.formatMessage({
-          defaultMessage: "Current city",
-          id: "de/Vcy",
-          description: "Label for current city field in About Me form",
-        })}
-      >
-        {currentCity || notProvided}
-      </FieldDisplay>
-      <FieldDisplay
-        hasError={!currentProvince}
-        label={intl.formatMessage({
-          defaultMessage: "Province or territory",
-          id: "yzgwjd",
-          description: "Label for current province or territory field",
-        })}
-      >
-        {currentProvince?.label
-          ? getLocalizedName(currentProvince.label, intl)
-          : notProvided}
-      </FieldDisplay>
       <FieldDisplay
         hasError={!preferredLang}
         label={intl.formatMessage({
diff --git a/apps/web/src/components/Profile/components/PersonalInformation/FormFields.tsx b/apps/web/src/components/Profile/components/PersonalInformation/FormFields.tsx
index 876966f1b34..1273115e4ad 100644
--- a/apps/web/src/components/Profile/components/PersonalInformation/FormFields.tsx
+++ b/apps/web/src/components/Profile/components/PersonalInformation/FormFields.tsx
@@ -4,7 +4,6 @@ import { useQuery } from "urql";
 import {
   Input,
   RadioGroup,
-  Select,
   localizedEnumToOptions,
 } from "@gc-digital-talent/forms";
 import {
@@ -28,15 +27,6 @@ const PersonalInformationFormOptions_Query = graphql(/* GraphQL */ `
         fr
       }
     }
-    provinceOrTerritories: localizedEnumStrings(
-      enumName: "ProvinceOrTerritory"
-    ) {
-      value
-      label {
-        en
-        fr
-      }
-    }
   }
 `);
 
@@ -92,30 +82,6 @@ const FormFields = ({ labels }: FormFieldProps) => {
             required: intl.formatMessage(errorMessages.required),
           }}
         />
-        <Input
-          id="currentCity"
-          name="currentCity"
-          type="text"
-          label={labels.currentCity}
-          rules={{
-            required: intl.formatMessage(errorMessages.required),
-          }}
-        />
-        <Select
-          id="currentProvince"
-          name="currentProvince"
-          label={labels.currentProvince}
-          nullSelection={intl.formatMessage({
-            defaultMessage: "Select a province or territory",
-            id: "H1wLfA",
-            description:
-              "Placeholder displayed on the About Me form province or territory field.",
-          })}
-          options={localizedEnumToOptions(data?.provinceOrTerritories, intl)}
-          rules={{
-            required: intl.formatMessage(errorMessages.required),
-          }}
-        />
       </div>
       <div
         data-h2-display="base(grid)"
diff --git a/apps/web/src/components/Profile/components/PersonalInformation/types.ts b/apps/web/src/components/Profile/components/PersonalInformation/types.ts
index c564884b1cb..e1e679fc867 100644
--- a/apps/web/src/components/Profile/components/PersonalInformation/types.ts
+++ b/apps/web/src/components/Profile/components/PersonalInformation/types.ts
@@ -3,7 +3,6 @@ import {
   CitizenshipStatus,
   Language,
   Maybe,
-  ProvinceOrTerritory,
 } from "@gc-digital-talent/graphql";
 
 export interface FormValues {
@@ -12,8 +11,6 @@ export interface FormValues {
   preferredLang?: Maybe<Language>;
   preferredLanguageForInterview?: Maybe<Language>;
   preferredLanguageForExam?: Maybe<Language>;
-  currentProvince?: Maybe<ProvinceOrTerritory>;
-  currentCity?: Maybe<string>;
   telephone?: Maybe<string>;
   firstName?: Maybe<string>;
   lastName?: Maybe<string>;
diff --git a/apps/web/src/components/Profile/components/PersonalInformation/utils.ts b/apps/web/src/components/Profile/components/PersonalInformation/utils.ts
index 98b87d6cecf..a6305c13b2e 100644
--- a/apps/web/src/components/Profile/components/PersonalInformation/utils.ts
+++ b/apps/web/src/components/Profile/components/PersonalInformation/utils.ts
@@ -31,16 +31,6 @@ export const getLabels = (intl: IntlShape) => ({
     id: "boPmF+",
     description: "Legend text for written exam language preference for exams",
   }),
-  currentProvince: intl.formatMessage({
-    defaultMessage: "Province or territory",
-    id: "yzgwjd",
-    description: "Label for current province or territory field",
-  }),
-  currentCity: intl.formatMessage({
-    defaultMessage: "Current city",
-    id: "de/Vcy",
-    description: "Label for current city field in About Me form",
-  }),
   telephone: intl.formatMessage(commonMessages.telephone),
   firstName: intl.formatMessage({
     defaultMessage: "Given name",
@@ -67,8 +57,6 @@ export const dataToFormValues = (
   preferredLang: data?.preferredLang?.value,
   preferredLanguageForInterview: data?.preferredLanguageForInterview?.value,
   preferredLanguageForExam: data?.preferredLanguageForExam?.value,
-  currentProvince: data?.currentProvince?.value,
-  currentCity: data?.currentCity,
   telephone: data?.telephone,
   firstName: data?.firstName,
   lastName: data?.lastName,
diff --git a/apps/web/src/components/Profile/components/WorkPreferences/Display.tsx b/apps/web/src/components/Profile/components/WorkPreferences/Display.tsx
index a49e5d12e23..90e7259d9c6 100644
--- a/apps/web/src/components/Profile/components/WorkPreferences/Display.tsx
+++ b/apps/web/src/components/Profile/components/WorkPreferences/Display.tsx
@@ -7,20 +7,28 @@ import {
   getWorkRegionsDetailed,
 } from "@gc-digital-talent/i18n";
 import { PositionDuration } from "@gc-digital-talent/graphql";
+import { FieldLabels } from "@gc-digital-talent/forms";
+
+import profileMessages from "~/messages/profileMessages";
+import { formatLocation } from "~/utils/userUtils";
 
 import FieldDisplay from "../FieldDisplay";
 import { PartialUser } from "./types";
 
 interface DisplayProps {
   user: PartialUser;
+  labels: FieldLabels;
 }
 
 const Display = ({
+  labels,
   user: {
     acceptedOperationalRequirements,
     positionDuration,
     locationPreferences,
     locationExemptions,
+    currentCity,
+    currentProvince,
   },
 }: DisplayProps) => {
   const intl = useIntl();
@@ -29,62 +37,32 @@ const Display = ({
   const acceptedRequirements =
     acceptedOperationalRequirements?.filter(notEmpty);
 
-  const durationMessage = positionDuration?.includes(PositionDuration.Temporary)
-    ? intl.formatMessage({
-        defaultMessage: "any duration (short term, long term, indeterminate).",
-        id: "YqWNkT",
-        description:
-          "Label displayed on Work Preferences form for any duration option",
-      })
-    : intl.formatMessage({
-        defaultMessage: "indeterminate (permanent only).",
-        id: "+YUDhx",
-        description:
-          "Label displayed on Work Preferences form for indeterminate duration option.",
-      });
+  const durationMessage = intl.formatMessage(
+    positionDuration?.includes(PositionDuration.Temporary)
+      ? profileMessages.anyDuration
+      : profileMessages.permanentDuration,
+  );
 
   return (
     <div data-h2-display="base(grid)" data-h2-gap="base(x1)">
       <FieldDisplay
         hasError={empty(positionDuration)}
-        label={intl.formatMessage({
-          defaultMessage: "Job duration",
-          id: "/yOfhq",
-          description: "Job duration label",
-        })}
+        label={labels.contractDuration}
       >
-        {positionDuration
-          ? `${intl.formatMessage({
-              defaultMessage: "I would accept a job that lasts for",
-              id: "ghg7uN",
-              description:
-                "Start of sentence describing a users accepted working term",
-            })} ${durationMessage}`
-          : notProvided}
+        {positionDuration ? durationMessage : notProvided}
       </FieldDisplay>
       <div>
-        <FieldDisplay
-          label={intl.formatMessage({
-            defaultMessage: "Job contexts",
-            id: "4pJgUJ",
-            description: "Work details label",
-          })}
-        />
+        <FieldDisplay label={labels.acceptedOperationalRequirements} />
         {acceptedRequirements?.length ? (
           <ul>
             {acceptedRequirements.map((requirement) => (
               <li key={requirement.value}>
-                {`${intl.formatMessage({
-                  defaultMessage: "I would accept a job that",
-                  id: "sTzKQs",
-                  description:
-                    "Start of sentence describing a users accepted working condition",
-                })} ${intl.formatMessage(
+                {intl.formatMessage(
                   getOperationalRequirement(
                     requirement.value,
                     "firstPersonNoBold",
                   ),
-                )}`}
+                )}
               </li>
             ))}
           </ul>
@@ -92,6 +70,9 @@ const Display = ({
           notProvided
         )}
       </div>
+      <FieldDisplay label={labels.currentLocation}>
+        {formatLocation({ city: currentCity, region: currentProvince, intl })}
+      </FieldDisplay>
       <div>
         <FieldDisplay
           label={intl.formatMessage({
diff --git a/apps/web/src/components/Profile/components/WorkPreferences/FormFields.tsx b/apps/web/src/components/Profile/components/WorkPreferences/FormFields.tsx
index 589c1b0de95..9b74e0ae82d 100644
--- a/apps/web/src/components/Profile/components/WorkPreferences/FormFields.tsx
+++ b/apps/web/src/components/Profile/components/WorkPreferences/FormFields.tsx
@@ -3,7 +3,10 @@ import { useQuery } from "urql";
 
 import {
   Checklist,
+  Field,
+  Input,
   RadioGroup,
+  Select,
   TextArea,
   localizedEnumToOptions,
 } from "@gc-digital-talent/forms";
@@ -27,6 +30,15 @@ const WorkPreferencesOptions_Query = graphql(/* GraphQL */ `
         fr
       }
     }
+    provinceOrTerritories: localizedEnumStrings(
+      enumName: "ProvinceOrTerritory"
+    ) {
+      value
+      label {
+        en
+        fr
+      }
+    }
   }
 `);
 
@@ -36,54 +48,102 @@ const FormFields = ({ labels }: FormFieldProps) => {
   useDirtyFields("work");
 
   return (
-    <>
-      <div data-h2-padding-top="base(x1)">
-        <RadioGroup
-          idPrefix="required-work-preferences"
-          legend={labels.wouldAcceptTemporary}
-          name="wouldAcceptTemporary"
-          id="wouldAcceptTemporary"
+    <div
+      data-h2-display="base(flex)"
+      data-h2-flex-direction="base(column)"
+      data-h2-row-gap="base(x1)"
+    >
+      <RadioGroup
+        idPrefix="required-work-preferences"
+        legend={labels.contractDuration}
+        name="wouldAcceptTemporary"
+        id="wouldAcceptTemporary"
+        rules={{
+          required: intl.formatMessage(errorMessages.required),
+        }}
+        items={[
+          {
+            value: "true",
+            label: intl.formatMessage({
+              defaultMessage:
+                "Any duration (short term, long term, indeterminate)",
+              id: "ohQoWa",
+              description:
+                "Label displayed on Work Preferences form for any duration option",
+            }),
+          },
+          {
+            value: "false",
+            label: intl.formatMessage({
+              defaultMessage: "Indeterminate (permanent only)",
+              id: "aB5p3B",
+              description:
+                "Label displayed on Work Preferences form for indeterminate duration option.",
+            }),
+          },
+        ]}
+      />
+      <Checklist
+        idPrefix="optional-work-preferences"
+        legend={labels.acceptedOperationalRequirements}
+        name="acceptedOperationalRequirements"
+        id="acceptedOperationalRequirements"
+        items={OperationalRequirements.map((value) => ({
+          value,
+          label: intl.formatMessage(
+            getOperationalRequirement(value, "firstPerson"),
+          ),
+        }))}
+      />
+      <Field.Fieldset
+        data-h2-display="base(flex)"
+        data-h2-flex-direction="base(column)"
+        data-h2-gap="base(x1)"
+      >
+        <Field.Legend
+          data-h2-font-size="base(h6)"
+          data-h2-font-weight="base(700)"
+          data-h2-margin-bottom="base(x1)"
+        >
+          {labels.currentLocation}
+        </Field.Legend>
+        <Select
+          id="currentProvince"
+          name="currentProvince"
+          label={labels.currentProvince}
+          nullSelection={intl.formatMessage({
+            defaultMessage: "Select a province or territory",
+            id: "H1wLfA",
+            description:
+              "Placeholder displayed on the About Me form province or territory field.",
+          })}
+          options={localizedEnumToOptions(data?.provinceOrTerritories, intl)}
           rules={{
             required: intl.formatMessage(errorMessages.required),
           }}
-          items={[
-            {
-              value: "true",
-              label: intl.formatMessage({
-                defaultMessage:
-                  "any duration (short term, long term, indeterminate).",
-                id: "YqWNkT",
-                description:
-                  "Label displayed on Work Preferences form for any duration option",
-              }),
-            },
-            {
-              value: "false",
-              label: intl.formatMessage({
-                defaultMessage: "indeterminate (permanent only).",
-                id: "+YUDhx",
-                description:
-                  "Label displayed on Work Preferences form for indeterminate duration option.",
-              }),
-            },
-          ]}
         />
-      </div>
-      <div data-h2-padding-top="base(x1)">
-        <Checklist
-          idPrefix="optional-work-preferences"
-          legend={labels.acceptedOperationalRequirements}
-          name="acceptedOperationalRequirements"
-          id="acceptedOperationalRequirements"
-          items={OperationalRequirements.map((value) => ({
-            value,
-            label: intl.formatMessage(
-              getOperationalRequirement(value, "firstPerson"),
-            ),
-          }))}
+        <Input
+          id="currentCity"
+          name="currentCity"
+          type="text"
+          label={labels.currentCity}
+          rules={{
+            required: intl.formatMessage(errorMessages.required),
+          }}
         />
-      </div>
-      <div data-h2-padding-top="base(x1)">
+      </Field.Fieldset>
+      <Field.Fieldset
+        data-h2-display="base(flex)"
+        data-h2-flex-direction="base(column)"
+        data-h2-gap="base(x1)"
+      >
+        <Field.Legend
+          data-h2-font-size="base(h6)"
+          data-h2-font-weight="base(700)"
+          data-h2-margin-bottom="base(x1)"
+        >
+          {labels.workLocationPreferences}
+        </Field.Legend>
         <Checklist
           idPrefix="work-location"
           legend={labels.locationPreferences}
@@ -97,16 +157,14 @@ const FormFields = ({ labels }: FormFieldProps) => {
             required: intl.formatMessage(errorMessages.required),
           }}
         />
-      </div>
-      <div data-h2-padding-top="base(x1)">
         <TextArea
           id="location-exemptions"
           label={labels.locationExemptions}
           name="locationExemptions"
           aria-describedby="location-exemption-description"
         />
-      </div>
-    </>
+      </Field.Fieldset>
+    </div>
   );
 };
 
diff --git a/apps/web/src/components/Profile/components/WorkPreferences/WorkPreferences.tsx b/apps/web/src/components/Profile/components/WorkPreferences/WorkPreferences.tsx
index e5ce3f40dc2..9a18b5dae31 100644
--- a/apps/web/src/components/Profile/components/WorkPreferences/WorkPreferences.tsx
+++ b/apps/web/src/components/Profile/components/WorkPreferences/WorkPreferences.tsx
@@ -10,12 +10,8 @@ import { Pool } from "@gc-digital-talent/graphql";
 
 import profileMessages from "~/messages/profileMessages";
 import {
-  hasAllEmptyFields as hasAllEmptyLocationFields,
-  hasEmptyRequiredFields as hasEmptyRequiredLocationFields,
-} from "~/validators/profile/workLocation";
-import {
-  hasAllEmptyFields as hasAllEmptyPreferenceFields,
-  hasEmptyRequiredFields as hasEmptyRequiredPreferenceFields,
+  hasAllEmptyFields,
+  hasEmptyRequiredFields,
 } from "~/validators/profile/workPreferences";
 import ToggleForm from "~/components/ToggleForm/ToggleForm";
 
@@ -35,11 +31,8 @@ const WorkPreferences = ({
   pool,
 }: SectionProps<Pick<Pool, "id">>) => {
   const intl = useIntl();
-  const isNull =
-    hasAllEmptyLocationFields(user) && hasAllEmptyPreferenceFields(user);
-  const emptyRequired =
-    hasEmptyRequiredLocationFields(user) ||
-    hasEmptyRequiredPreferenceFields(user);
+  const isNull = hasAllEmptyFields(user);
+  const emptyRequired = hasEmptyRequiredFields(user);
   const { labels, isEditing, setIsEditing, icon, title } = useSectionInfo({
     section: "work",
     isNull,
@@ -109,7 +102,7 @@ const WorkPreferences = ({
       )}
       <ToggleSection.Content>
         <ToggleSection.InitialContent>
-          {isNull ? <NullDisplay /> : <Display user={user} />}
+          {isNull ? <NullDisplay /> : <Display user={user} labels={labels} />}
         </ToggleSection.InitialContent>
         <ToggleSection.OpenContent>
           <BasicForm
diff --git a/apps/web/src/components/Profile/components/WorkPreferences/types.ts b/apps/web/src/components/Profile/components/WorkPreferences/types.ts
index 970c3925b50..fde74e84d5f 100644
--- a/apps/web/src/components/Profile/components/WorkPreferences/types.ts
+++ b/apps/web/src/components/Profile/components/WorkPreferences/types.ts
@@ -2,6 +2,8 @@ import { UpdateUserAsUserInput, User } from "@gc-digital-talent/graphql";
 
 export type PartialUser = Pick<
   User,
+  | "currentCity"
+  | "currentProvince"
   | "acceptedOperationalRequirements"
   | "positionDuration"
   | "locationPreferences"
@@ -10,6 +12,8 @@ export type PartialUser = Pick<
 
 export type FormValues = Pick<
   UpdateUserAsUserInput,
+  | "currentCity"
+  | "currentProvince"
   | "acceptedOperationalRequirements"
   | "locationPreferences"
   | "locationExemptions"
diff --git a/apps/web/src/components/Profile/components/WorkPreferences/utils.ts b/apps/web/src/components/Profile/components/WorkPreferences/utils.ts
index 02d1bc5313a..a68eba2227d 100644
--- a/apps/web/src/components/Profile/components/WorkPreferences/utils.ts
+++ b/apps/web/src/components/Profile/components/WorkPreferences/utils.ts
@@ -6,20 +6,34 @@ import {
 } from "@gc-digital-talent/graphql";
 import { unpackMaybes } from "@gc-digital-talent/helpers";
 
+import profileMessages from "~/messages/profileMessages";
+
 import { FormValues, PartialUser } from "./types";
 
 export const getLabels = (intl: IntlShape) => ({
-  wouldAcceptTemporary: intl.formatMessage({
-    defaultMessage: "I would consider accepting a job that lasts for...",
-    id: "/DCykA",
-    description:
-      "Legend Text for required work preferences options in work preferences form",
+  contractDuration: intl.formatMessage(profileMessages.contractDuration),
+  acceptedOperationalRequirements: intl.formatMessage(
+    profileMessages.acceptableRequirements,
+  ),
+  currentLocation: intl.formatMessage({
+    defaultMessage: "Your current location",
+    id: "J3yJhp",
+    description: "Legend for users current location",
   }),
-  acceptedOperationalRequirements: intl.formatMessage({
-    defaultMessage: "I would consider accepting a job that...",
-    id: "82Oe0C",
-    description:
-      "Legend for optional work preferences check list in work preferences form",
+  currentProvince: intl.formatMessage({
+    defaultMessage: "Province, territory or region",
+    id: "fm2lKX",
+    description: "Label for current province or territory field",
+  }),
+  currentCity: intl.formatMessage({
+    defaultMessage: "City or town",
+    id: "Qvep+v",
+    description: "Label for current city field in About Me form",
+  }),
+  workLocationPreferences: intl.formatMessage({
+    defaultMessage: "Work location preferences",
+    id: "ahK7mI",
+    description: "Legend for the work location preferences section",
   }),
   locationPreferences: intl.formatMessage({
     defaultMessage: "I am willing to work in the...",
@@ -47,6 +61,8 @@ export const dataToFormValues = (data: PartialUser): FormValues => {
     acceptedOperationalRequirements: unpackMaybes(
       data.acceptedOperationalRequirements?.map((req) => req?.value),
     ),
+    currentProvince: data?.currentProvince?.value,
+    currentCity: data?.currentCity,
     locationPreferences: unpackMaybes(
       data.locationPreferences?.map((pref) => pref?.value),
     ),
@@ -72,5 +88,7 @@ export const formValuesToSubmitData = (
     acceptedOperationalRequirements: values.acceptedOperationalRequirements,
     locationPreferences: values.locationPreferences,
     locationExemptions: values.locationExemptions,
+    currentCity: values.currentCity,
+    currentProvince: values.currentProvince,
   };
 };
diff --git a/apps/web/src/components/UserProfile/ProfileSections/WorkLocationSection.tsx b/apps/web/src/components/UserProfile/ProfileSections/WorkLocationSection.tsx
deleted file mode 100644
index 2ddef6c9b92..00000000000
--- a/apps/web/src/components/UserProfile/ProfileSections/WorkLocationSection.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import { useIntl } from "react-intl";
-
-import { Well } from "@gc-digital-talent/ui";
-import { commonMessages, getLocalizedName } from "@gc-digital-talent/i18n";
-import { insertBetween } from "@gc-digital-talent/helpers";
-import { User } from "@gc-digital-talent/graphql";
-
-import {
-  anyCriteriaSelected,
-  hasAllEmptyFields,
-} from "~/validators/profile/workLocation";
-
-interface WorkLocationSectionProps {
-  user: Pick<User, "locationPreferences" | "locationExemptions">;
-}
-
-const WorkLocationSection = ({ user }: WorkLocationSectionProps) => {
-  const intl = useIntl();
-  const { locationPreferences, locationExemptions } = user;
-  // generate array of location preferences localized and formatted with spaces/commas
-  const regionPreferencesSquished = locationPreferences?.map((region) =>
-    getLocalizedName(region?.label, intl, true),
-  );
-  const regionPreferences = regionPreferencesSquished
-    ? insertBetween(", ", regionPreferencesSquished)
-    : "";
-
-  return (
-    <Well>
-      <div data-h2-flex-grid="base(flex-start, x2, x1)">
-        {anyCriteriaSelected(user) && (
-          <div data-h2-flex-item="base(1of1)">
-            <p>
-              <span data-h2-display="base(block)">
-                {intl.formatMessage({
-                  defaultMessage: "Work location:",
-                  id: "b5bUa0",
-                  description: "Work Location label, followed by colon",
-                })}
-              </span>
-              <span data-h2-font-weight="base(700)">{regionPreferences}</span>
-            </p>
-          </div>
-        )}
-        {!!locationExemptions && (
-          <div data-h2-flex-item="base(1of1)">
-            <p>
-              <span data-h2-display="base(block)">
-                {intl.formatMessage({
-                  defaultMessage: "Work location exceptions",
-                  id: "OpKC2i",
-                  description: "Work location exceptions label",
-                })}
-                {intl.formatMessage(commonMessages.dividingColon)}
-              </span>
-              <span data-h2-font-weight="base(700)">{locationExemptions}</span>
-            </p>
-          </div>
-        )}
-        {hasAllEmptyFields(user) && (
-          <div data-h2-flex-item="base(1of1)">
-            <p>{intl.formatMessage(commonMessages.noInformationProvided)}</p>
-          </div>
-        )}
-      </div>
-    </Well>
-  );
-};
-
-export default WorkLocationSection;
diff --git a/apps/web/src/components/UserProfile/ProfileSections/WorkPreferencesSection.tsx b/apps/web/src/components/UserProfile/ProfileSections/WorkPreferencesSection.tsx
index 45dc9216e0f..863ff7c3849 100644
--- a/apps/web/src/components/UserProfile/ProfileSections/WorkPreferencesSection.tsx
+++ b/apps/web/src/components/UserProfile/ProfileSections/WorkPreferencesSection.tsx
@@ -1,73 +1,52 @@
 import { useIntl } from "react-intl";
-import isEmpty from "lodash/isEmpty";
+import CheckCircleIcon from "@heroicons/react/16/solid/CheckCircleIcon";
+import XCircleIcon from "@heroicons/react/16/solid/XCircleIcon";
 
 import { Well } from "@gc-digital-talent/ui";
 import {
   commonMessages,
+  getLocalizedName,
   getOperationalRequirement,
+  OperationalRequirements,
 } from "@gc-digital-talent/i18n";
-import {
-  User,
-  OperationalRequirement,
-  PositionDuration,
-} from "@gc-digital-talent/graphql";
+import { User, PositionDuration } from "@gc-digital-talent/graphql";
+import { insertBetween, unpackMaybes } from "@gc-digital-talent/helpers";
 
 import { hasAllEmptyFields } from "~/validators/profile/workPreferences";
+import profileMessages from "~/messages/profileMessages";
+import { formatLocation } from "~/utils/userUtils";
 
 interface WorkPreferencesSectionProps {
-  user: Pick<User, "acceptedOperationalRequirements" | "positionDuration">;
+  user: Pick<
+    User,
+    | "acceptedOperationalRequirements"
+    | "positionDuration"
+    | "locationPreferences"
+    | "locationExemptions"
+    | "currentCity"
+    | "currentProvince"
+  >;
 }
 
 const WorkPreferencesSection = ({ user }: WorkPreferencesSectionProps) => {
   const intl = useIntl();
-  const { acceptedOperationalRequirements, positionDuration } = user;
-
-  // generate array of accepted operational requirements
-  const acceptedOperationalArray = acceptedOperationalRequirements
-    ? acceptedOperationalRequirements.map((opRequirement) => (
-        <li key={opRequirement?.value}>
-          {opRequirement
-            ? intl.formatMessage(
-                getOperationalRequirement(opRequirement.value, "firstPerson"),
-              )
-            : ""}
-        </li>
-      ))
-    : null;
-
-  const anyCriteriaSelected = !isEmpty(acceptedOperationalArray);
-
-  // all V2 operational requirements
-  const operationalRequirementsSubsetV2 = [
-    OperationalRequirement.OvertimeOccasional,
-    OperationalRequirement.OvertimeRegular,
-    OperationalRequirement.ShiftWork,
-    OperationalRequirement.OnCall,
-    OperationalRequirement.Travel,
-    OperationalRequirement.TransportEquipment,
-    OperationalRequirement.DriversLicense,
-  ];
-
-  // requirements that have not been selected made into an array
-  const unselectedOperationalArray = operationalRequirementsSubsetV2.filter(
-    (requirement) =>
-      !acceptedOperationalRequirements?.some(
-        (req) => req?.value === requirement,
-      ),
+  const {
+    acceptedOperationalRequirements,
+    positionDuration,
+    currentCity,
+    currentProvince,
+    locationPreferences,
+    locationExemptions,
+  } = user;
+  const acceptedRequirements = unpackMaybes(
+    acceptedOperationalRequirements,
+  ).map((requirement) => requirement.value);
+  const regionPreferencesSquished = locationPreferences?.map((region) =>
+    getLocalizedName(region?.label, intl, true),
   );
-
-  // generate list of unaccepted operational requirements
-  const unacceptedOperationalArray = unselectedOperationalArray
-    ? unselectedOperationalArray.map((opRequirement) => (
-        <li key={opRequirement}>
-          {opRequirement
-            ? intl.formatMessage(
-                getOperationalRequirement(opRequirement, "firstPerson"),
-              )
-            : ""}
-        </li>
-      ))
-    : null;
+  const regionPreferences = regionPreferencesSquished
+    ? insertBetween(", ", regionPreferencesSquished)
+    : "";
 
   return (
     <Well>
@@ -75,25 +54,9 @@ const WorkPreferencesSection = ({ user }: WorkPreferencesSectionProps) => {
         {positionDuration &&
           positionDuration.includes(PositionDuration.Temporary) && (
             <div data-h2-flex-item="base(1of1)">
-              <p>
-                {intl.formatMessage({
-                  defaultMessage:
-                    "I would consider accepting a job that lasts for:",
-                  id: "Vc9vE7",
-                  description:
-                    "Label for what length of position user prefers, followed by colon",
-                })}
-              </p>
+              <p>{intl.formatMessage(profileMessages.contractDuration)}</p>
               <ul data-h2-padding="base(0, 0, 0, x1)">
-                <li>
-                  {intl.formatMessage({
-                    defaultMessage:
-                      "any duration. (short term, long term, or indeterminate duration)",
-                    id: "uHx3G7",
-                    description:
-                      "Label displayed on Work Preferences form for any duration option",
-                  })}
-                </li>
+                <li>{intl.formatMessage(profileMessages.anyDuration)}</li>
               </ul>
             </div>
           )}
@@ -101,71 +64,90 @@ const WorkPreferencesSection = ({ user }: WorkPreferencesSectionProps) => {
         {positionDuration &&
           !positionDuration.includes(PositionDuration.Temporary) && (
             <div data-h2-flex-item="base(1of1)">
-              <p>
-                {intl.formatMessage({
-                  defaultMessage:
-                    "I would consider accepting a job that lasts for:",
-                  id: "Vc9vE7",
-                  description:
-                    "Label for what length of position user prefers, followed by colon",
-                })}
-              </p>
+              <p>{intl.formatMessage(profileMessages.contractDuration)}</p>
               <ul data-h2-padding="base(0, 0, 0, x1)">
-                <li>
-                  {intl.formatMessage({
-                    defaultMessage: "Permanent duration",
-                    id: "8cRL8r",
-                    description: "Permanent duration only",
-                  })}{" "}
-                </li>
+                <li>{intl.formatMessage(profileMessages.anyDuration)}</li>
               </ul>
             </div>
           )}
 
-        {anyCriteriaSelected && !isEmpty(unacceptedOperationalArray) && (
-          <div data-h2-flex-item="base(1of1)">
-            <p>
-              {intl.formatMessage({
-                defaultMessage: "I would consider accepting a job that:",
-                id: "l/jGX9",
-                description:
-                  "Label for what conditions a user will accept, followed by a colon",
+        <div data-h2-flex-item="base(1of1)">
+          <p>{intl.formatMessage(profileMessages.acceptableRequirements)}</p>
+          <ul data-h2-padding="base(0, 0, 0, x1)">
+            {OperationalRequirements.map((requirement) => (
+              <li key={requirement}>
+                <span data-h2-display="base(flex)" data-h2-gap="base(x.25)">
+                  <span
+                    data-h2-width="base(x.5)"
+                    data-h2-flex-shrink="base(0)"
+                    data-h2-vertical-align="base(bottom)"
+                  >
+                    {acceptedRequirements.includes(requirement) ? (
+                      <CheckCircleIcon
+                        aria-label={intl.formatMessage(commonMessages.accepted)}
+                        data-h2-color="base(success)"
+                      />
+                    ) : (
+                      <XCircleIcon
+                        aria-label={intl.formatMessage(
+                          commonMessages.notAccepted,
+                        )}
+                        data-h2-color="base(gray)"
+                      />
+                    )}
+                  </span>
+                  <span>
+                    {intl.formatMessage(
+                      getOperationalRequirement(
+                        requirement,
+                        "firstPersonNoBold",
+                      ),
+                    )}
+                  </span>
+                </span>
+              </li>
+            ))}
+          </ul>
+        </div>
+        <div data-h2-flex-item="base(1of1)">
+          <p>
+            <span data-h2-display="base(block)">
+              {intl.formatMessage(profileMessages.currentLocation)}
+            </span>
+            <span data-h2-font-weight="base(700)">
+              {formatLocation({
+                city: currentCity,
+                region: currentProvince,
+                intl,
               })}
-            </p>
-            <ul data-h2-padding="base(0, 0, 0, x1)">
-              {acceptedOperationalArray}
-            </ul>
-          </div>
-        )}
-        {anyCriteriaSelected && !isEmpty(unacceptedOperationalArray) && (
-          <div data-h2-flex-item="base(1of1)">
-            <p>
+            </span>
+          </p>
+        </div>
+        <div data-h2-flex-item="base(1of1)">
+          <p>
+            <span data-h2-display="base(block)">
               {intl.formatMessage({
-                defaultMessage:
-                  "I would <strong>not consider</strong> accepting a job that:",
-                id: "TwSvmH",
-                description: "would not accept job line before a list",
+                defaultMessage: "Work location:",
+                id: "b5bUa0",
+                description: "Work Location label, followed by colon",
               })}
-            </p>
-            <ul data-h2-padding="base(0, 0, 0, x1)">
-              {unacceptedOperationalArray}
-            </ul>
-          </div>
-        )}
-
-        {anyCriteriaSelected && isEmpty(unacceptedOperationalArray) && (
+            </span>
+            <span data-h2-font-weight="base(700)">{regionPreferences}</span>
+          </p>
+        </div>
+        {!!locationExemptions && (
           <div data-h2-flex-item="base(1of1)">
             <p>
-              {intl.formatMessage({
-                defaultMessage: "I would consider accepting a job that:",
-                id: "l/jGX9",
-                description:
-                  "Label for what conditions a user will accept, followed by a colon",
-              })}
+              <span data-h2-display="base(block)">
+                {intl.formatMessage({
+                  defaultMessage: "Work location exceptions",
+                  id: "OpKC2i",
+                  description: "Work location exceptions label",
+                })}
+                {intl.formatMessage(commonMessages.dividingColon)}
+              </span>
+              <span data-h2-font-weight="base(700)">{locationExemptions}</span>
             </p>
-            <ul data-h2-padding="base(0, 0, 0, x1)">
-              {acceptedOperationalArray}
-            </ul>
           </div>
         )}
 
diff --git a/apps/web/src/components/UserProfile/UserProfile.tsx b/apps/web/src/components/UserProfile/UserProfile.tsx
index a6bd542206f..35901d7b0d9 100644
--- a/apps/web/src/components/UserProfile/UserProfile.tsx
+++ b/apps/web/src/components/UserProfile/UserProfile.tsx
@@ -2,7 +2,6 @@ import { useIntl } from "react-intl";
 import ChatBubbleLeftRightIcon from "@heroicons/react/24/outline/ChatBubbleLeftRightIcon";
 import BuildingLibraryIcon from "@heroicons/react/24/outline/BuildingLibraryIcon";
 import BoltIcon from "@heroicons/react/24/outline/BoltIcon";
-import MapPinIcon from "@heroicons/react/24/outline/MapPinIcon";
 import HandThumbUpIcon from "@heroicons/react/24/outline/HandThumbUpIcon";
 import UserIcon from "@heroicons/react/24/outline/UserIcon";
 import UserCircleIcon from "@heroicons/react/24/solid/UserCircleIcon";
@@ -23,7 +22,6 @@ import AboutSection from "./ProfileSections/AboutSection";
 import DiversityEquityInclusionSection from "./ProfileSections/DiversityEquityInclusionSection";
 import GovernmentInformationSection from "./ProfileSections/GovernmentInformationSection";
 import LanguageInformationSection from "./ProfileSections/LanguageInformationSection";
-import WorkLocationSection from "./ProfileSections/WorkLocationSection";
 import WorkPreferencesSection from "./ProfileSections/WorkPreferencesSection";
 import SkillShowcaseSection from "./SkillShowcaseSection";
 
@@ -73,16 +71,12 @@ const UserProfile = ({ user, headingLevel = "h2" }: UserProfileProps) => {
               </TableOfContents.AnchorLink>
             </TableOfContents.ListItem>
 
-            <TableOfContents.ListItem>
-              <TableOfContents.AnchorLink id={PAGE_SECTION_ID.WORK_LOCATION}>
-                {intl.formatMessage(navigationMessages.workLocation)}
-              </TableOfContents.AnchorLink>
-            </TableOfContents.ListItem>
             <TableOfContents.ListItem>
               <TableOfContents.AnchorLink id={PAGE_SECTION_ID.WORK_PREFERENCES}>
                 {intl.formatMessage(navigationMessages.workPreferences)}
               </TableOfContents.AnchorLink>
             </TableOfContents.ListItem>
+
             <TableOfContents.ListItem>
               <TableOfContents.AnchorLink
                 id={PAGE_SECTION_ID.CAREER_TIMELINE_AND_RECRUITMENT}
@@ -140,16 +134,6 @@ const UserProfile = ({ user, headingLevel = "h2" }: UserProfileProps) => {
             </TableOfContents.Heading>
             <GovernmentInformationSection user={user} />
           </TableOfContents.Section>
-          <TableOfContents.Section id={PAGE_SECTION_ID.WORK_LOCATION}>
-            <TableOfContents.Heading
-              as={headingLevel}
-              icon={MapPinIcon}
-              data-h2-margin="base(x1.5 0 x1 0)"
-            >
-              {intl.formatMessage(navigationMessages.workLocation)}
-            </TableOfContents.Heading>
-            <WorkLocationSection user={user} />
-          </TableOfContents.Section>
           <TableOfContents.Section id={PAGE_SECTION_ID.WORK_PREFERENCES}>
             <TableOfContents.Heading
               as={headingLevel}
diff --git a/apps/web/src/constants/sections/userProfile.ts b/apps/web/src/constants/sections/userProfile.ts
index 62ef780d37b..378d2d6fc79 100644
--- a/apps/web/src/constants/sections/userProfile.ts
+++ b/apps/web/src/constants/sections/userProfile.ts
@@ -3,7 +3,6 @@ export const PAGE_SECTION_ID = {
   DEI: "diversity-equity-inclusion-section",
   LANGUAGE: "language-section",
   GOVERNMENT: "government-section",
-  WORK_LOCATION: "work-location-section",
   WORK_PREFERENCES: "work-preferences-section",
   CAREER_TIMELINE_AND_RECRUITMENT: "career-timeline-section",
   SKILL_SHOWCASE: "skill-showcase",
diff --git a/apps/web/src/lang/fr.json b/apps/web/src/lang/fr.json
index 5a731fd0826..3d2ba6bd657 100644
--- a/apps/web/src/lang/fr.json
+++ b/apps/web/src/lang/fr.json
@@ -95,10 +95,6 @@
     "defaultMessage": "Résultats de l’évaluation",
     "description": "Title for assessment results"
   },
-  "+YUDhx": {
-    "defaultMessage": "indéterminée (emploi permanent seulement).",
-    "description": "Label displayed on Work Preferences form for indeterminate duration option."
-  },
   "+agJAH": {
     "defaultMessage": "Mes rôles",
     "description": "Label displayed for the table's My Roles column header."
@@ -235,10 +231,6 @@
     "defaultMessage": "La Directive sur les talents numériques précise que les ministères sont censés utiliser les marges de manœuvre et les meilleures pratiques qui existent dans divers instruments politiques pour garantir une base de talents stable et durable, en mettant notamment l’accent sur l’embauche.",
     "description": "The directives digital enabling conditions component"
   },
-  "/DCykA": {
-    "defaultMessage": "J'envisagerais d'accepter un emploi d'une durée de...",
-    "description": "Legend Text for required work preferences options in work preferences form"
-  },
   "/I7wrY": {
     "defaultMessage": "Lier des compétences en vedette",
     "description": "Title for skills on Experience form"
@@ -387,10 +379,6 @@
     "defaultMessage": "Afficher tous<hidden> les filtres avancés</hidden>",
     "description": "Button text to show all advanced filters"
   },
-  "/yOfhq": {
-    "defaultMessage": "Durée de l’emploi ",
-    "description": "Job duration label "
-  },
   "/zVZCP": {
     "defaultMessage": "Collectivité des cadres",
     "description": "Heading for executive jobs in government"
@@ -1287,10 +1275,6 @@
     "defaultMessage": "Fermer",
     "description": "Button text used to close an open modal"
   },
-  "4pJgUJ": {
-    "defaultMessage": "Contextes professionnels",
-    "description": "Work details label"
-  },
   "4qdoau": {
     "defaultMessage": "Compétence introuvable",
     "description": "Link to suggestions on what to do if you can't find a skill in the skill browser."
@@ -1563,6 +1547,10 @@
     "defaultMessage": "Laissez notre équipe vous épargner du temps et de l’énergie en associant vos besoins à des professionnels des <abbreviation>TI</abbreviation> préalablement sélectionnés et possédant les compétences requises pour le poste. Tous les talents de nos bassins de dotation ont été sélectionnés à l’issue d’un processus concurrentiel. Vous pouvez donc passer directement à l’entrevue et décider s’ils conviennent à votre équipe.",
     "description": "Summary for to go to the search page on Browse IT jobs page"
   },
+  "6UgbrG": {
+    "defaultMessage": "Exigences de poste acceptables",
+    "description": "Legend for optional work preferences check list in work preferences form"
+  },
   "6VyRZ/": {
     "defaultMessage": "Expériences personnelles",
     "description": "Heading for personal experiences in experience by type listing"
@@ -1847,10 +1835,6 @@
     "defaultMessage": "On vous demandera de confirmer les renseignements que vous avez fournis.",
     "description": "How it works, step 3 content sentence 1"
   },
-  "82Oe0C": {
-    "defaultMessage": "J'envisagerais d'accepter un emploi qui...",
-    "description": "Legend for optional work preferences check list in work preferences form"
-  },
   "84XrK+": {
     "defaultMessage": "On ne trouve aucun élément ici.",
     "description": "Default message for an empty table"
@@ -1951,10 +1935,6 @@
     "defaultMessage": "Français - Votre travail",
     "description": "Label for the French - Your Work textarea in the edit pool page."
   },
-  "8cRL8r": {
-    "defaultMessage": "Durée permanente",
-    "description": "Permanent duration only"
-  },
   "8fQWTc": {
     "defaultMessage": "Toute durée (court terme, long terme ou indéterminée) (recommandé)",
     "description": "No preference for employment duration - will accept any"
@@ -3847,6 +3827,10 @@
     "defaultMessage": "Exigence de sélection : <strong>{educationRequirementOption}</strong>.",
     "description": "Application snapshot minimum experience section description"
   },
+  "J3yJhp": {
+    "defaultMessage": "Votre lieu de résidence actuel",
+    "description": "Legend for users current location"
+  },
   "J6atIv": {
     "defaultMessage": "Liste de compétences",
     "description": "Link text for explore skills page"
@@ -5287,6 +5271,10 @@
     "defaultMessage": "Études minimales",
     "description": "Title for application education"
   },
+  "Qvep+v": {
+    "defaultMessage": "Ville ou municipalité",
+    "description": "Label for current city field in About Me form"
+  },
   "QvyQc3": {
     "defaultMessage": "Expériences de travail",
     "description": "Heading for work experiences"
@@ -5811,10 +5799,6 @@
     "defaultMessage": "Gestionnaires de l'initiative sur le numérique",
     "description": "Title for group-specific resource card"
   },
-  "TwSvmH": {
-    "defaultMessage": "Je <strong>n'envisagerais pas</strong> d'accepter un emploi qui :",
-    "description": "would not accept job line before a list"
-  },
   "TxVbLI": {
     "defaultMessage": "Filtre de classification",
     "description": "Heading for classification filter of the search form."
@@ -6038,6 +6022,10 @@
     "defaultMessage": "Aucune compétence trouvée.",
     "description": "Messaged displayed when no skill exists."
   },
+  "VFK3wC": {
+    "defaultMessage": "Préférence pour la durée du contrat",
+    "description": "Legend Text for required work preferences options in work preferences form"
+  },
   "VHG9Gm": {
     "defaultMessage": "Désélectionner <hidden> rangées sélectionnées</hidden>",
     "description": "Button text to deselect all table rows"
@@ -6106,10 +6094,6 @@
     "defaultMessage": "Il y a une exigence linguistique manquante",
     "description": "Title that appears when a user is missing a language requirement."
   },
-  "Vc9vE7": {
-    "defaultMessage": "J'envisagerais d'accepter un emploi d'une durée de :",
-    "description": "Label for what length of position user prefers, followed by colon"
-  },
   "VcOlXA": {
     "defaultMessage": "Énoncé de confidentialité",
     "description": "Label for the privacy link in the Footer."
@@ -6774,10 +6758,6 @@
     "defaultMessage": "Vous n’avez pas encore d’expérience de parcours professionnel.",
     "description": "Null state messages for career timeline list"
   },
-  "YqWNkT": {
-    "defaultMessage": "n'importe quelle durée (court terme, long terme, période indéterminée).",
-    "description": "Label displayed on Work Preferences form for any duration option"
-  },
   "Ysf8wI": {
     "defaultMessage": "Modification des renseignements gouvernementaux",
     "description": "Button text to start editing government information"
@@ -7002,6 +6982,10 @@
     "defaultMessage": "Processus",
     "description": "Link to the Pools page in the nav menu."
   },
+  "aB5p3B": {
+    "defaultMessage": "Indéterminée (emploi permanent seulement)",
+    "description": "Label displayed on Work Preferences form for indeterminate duration option."
+  },
   "aCKQVB": {
     "defaultMessage": "Question (EN)",
     "description": "Label for an English general question"
@@ -7086,6 +7070,10 @@
     "defaultMessage": "Afficher les candidatures en cours ({applicationCount})",
     "description": "Heading for applications in progress accordion on profile and applications."
   },
+  "ahK7mI": {
+    "defaultMessage": "Préférences pour le lieu de travail",
+    "description": "Legend for the work location preferences section"
+  },
   "aiYTNf": {
     "defaultMessage": "Cet utilisateur a été supprimé.",
     "description": "Message displayed when admin views a deleted user."
@@ -7594,10 +7582,6 @@
     "defaultMessage": "Veuillez indiquer s'il y a une ville que vous aimeriez exclure d'une région.",
     "description": "Location Exemptions field label for work location preference form"
   },
-  "de/Vcy": {
-    "defaultMessage": "Ville actuelle",
-    "description": "Label for current city field in About Me form"
-  },
   "deE+LO": {
     "defaultMessage": "Le présent formulaire vous permet d’entrer du texte tant en français qu’en anglais pour votre question.",
     "description": "Subtitle for general question dialog"
@@ -8046,6 +8030,10 @@
     "defaultMessage": "Plan d'évaluation",
     "description": "Title for the assessment plan builder"
   },
+  "fm2lKX": {
+    "defaultMessage": "Province, territoire ou région",
+    "description": "Label for current province or territory field"
+  },
   "fpdcE/": {
     "defaultMessage": "<strong>Établissement de rapports obligatoires</strong>. Désormais nécessaires lorsque vous souhaitez lancer un processus d’acquisition de talents numériques, en particulier si vous envisagez d’établir un contrat parce que vous avez du mal à trouver les bons talents à embaucher. Pas d’approbation supplémentaire – il suffit de nous faire part de vos projets!",
     "description": "Description for the digital Services contracting form"
@@ -8238,10 +8226,6 @@
     "defaultMessage": "Afficher les détails de {experienceName}",
     "description": "Button text to show a specific experience's details"
   },
-  "ghg7uN": {
-    "defaultMessage": "J'accepterais un emploi d'une durée de...",
-    "description": "Start of sentence describing a users accepted working term"
-  },
   "giUfys": {
     "defaultMessage": "Expérience professionnelle",
     "description": "Title for work experience section"
@@ -9086,10 +9070,6 @@
     "defaultMessage": "Dans votre fuseau horaire actuel, ceci veut dire que les demandes seront acceptées jusqu’à :",
     "description": "Third paragraph for pool deadlines dialog"
   },
-  "l/jGX9": {
-    "defaultMessage": "J'envisagerais d'accepter un emploi qui :",
-    "description": "Label for what conditions a user will accept, followed by a colon"
-  },
   "l1f8zy": {
     "defaultMessage": "Ou demander à recevoir des candidats par ordre de bassin",
     "description": "Lead-in text to list of pools managers can request candidates from"
@@ -9750,6 +9730,10 @@
     "defaultMessage": "Candidat non rétabli",
     "description": "Error message for reinstating a candidate"
   },
+  "ohQoWa": {
+    "defaultMessage": "N'importe quelle durée (court terme, long terme, période indéterminée)",
+    "description": "Label displayed on Work Preferences form for any duration option"
+  },
   "oiaUxW": {
     "defaultMessage": "Si vous avez déjà un compte de CléGC, vous pouvez ouvrir une session dans votre profil sur la plateforme Talents numériques du GC à l'aide de votre CléGC, même si vous n'avez jamais utilisé cette plateforme avant. Si vous ne savez pas si vous avez déjà un compte de CléGC, continuez vers le site Web et essayez d'ouvrir une session. Si vous ne vous souvenez pas de votre mot de passe, c'est là que vous pourrez aussi le réinitialiser.",
     "description": "GCKey answer for when user already has an account"
@@ -10402,10 +10386,6 @@
     "defaultMessage": "Supprimer l’adhésion<hidden> dans {team}</hidden>",
     "description": "Label for the form to remove a team role from a user"
   },
-  "sTzKQs": {
-    "defaultMessage": "J'accepterais un emploi qui",
-    "description": "Start of sentence describing a users accepted working condition"
-  },
   "sWBbdX": {
     "defaultMessage": "Je souhaite être pris en considération pour des postes en français",
     "description": "French Positions message"
@@ -10694,10 +10674,6 @@
     "defaultMessage": "Ajouter une nouvelle question",
     "description": "Button text to add a new general question to a pool"
   },
-  "uHx3G7": {
-    "defaultMessage": "de toute durée. (à court terme, à long terme ou indéterminée)",
-    "description": "Label displayed on Work Preferences form for any duration option"
-  },
   "uIUSdN": {
     "defaultMessage": "Apprenez-en davantage sur les modalités du site Talents numériques du GC.",
     "description": "Subtitle for the terms and conditions page."
@@ -10822,6 +10798,10 @@
     "defaultMessage": "Mises à jour de l'application",
     "description": "Title for application updates checklist"
   },
+  "v9A5Cb": {
+    "defaultMessage": "Emplacement actuel",
+    "description": "Legend for users current location"
+  },
   "v9mTgX": {
     "defaultMessage": "Un processus de demande en ligne sera bientôt disponible afin de permettre aux gens d’exprimer leur intérêt. Entre-temps, nous vous encourageons à envoyer votre curriculum vitae et votre lettre de présentation par courriel, à edsc.pda-iap.esdc@hrsdc-rhdcc.gc.ca.",
     "description": "Learn more dialog question eleven paragraph one"
@@ -11438,10 +11418,6 @@
     "defaultMessage": "Ajouter au nouveau bassin",
     "description": "Confirmation button for add to pool dialog"
   },
-  "yzgwjd": {
-    "defaultMessage": "Province ou territoire",
-    "description": "Label for current province or territory field"
-  },
   "z/J4uL": {
     "defaultMessage": "Statut de l’employé :",
     "description": "Label for applicant's employee status"
diff --git a/apps/web/src/messages/profileMessages.ts b/apps/web/src/messages/profileMessages.ts
index c99981e61b9..d7a8fe020f4 100644
--- a/apps/web/src/messages/profileMessages.ts
+++ b/apps/web/src/messages/profileMessages.ts
@@ -33,6 +33,35 @@ const messages = defineMessages({
     id: "+2PPS3",
     description: "Title for priority status",
   },
+  contractDuration: {
+    defaultMessage: "Contract duration preference",
+    id: "VFK3wC",
+    description:
+      "Legend Text for required work preferences options in work preferences form",
+  },
+  anyDuration: {
+    defaultMessage: "Any duration (short term, long term, indeterminate)",
+    id: "ohQoWa",
+    description:
+      "Label displayed on Work Preferences form for any duration option",
+  },
+  permanentDuration: {
+    defaultMessage: "Indeterminate (permanent only)",
+    id: "aB5p3B",
+    description:
+      "Label displayed on Work Preferences form for indeterminate duration option.",
+  },
+  acceptableRequirements: {
+    defaultMessage: "Acceptable job requirements",
+    id: "6UgbrG",
+    description:
+      "Legend for optional work preferences check list in work preferences form",
+  },
+  currentLocation: {
+    defaultMessage: "Current location",
+    id: "v9A5Cb",
+    description: "Legend for users current location",
+  },
 });
 
 export default messages;
diff --git a/apps/web/src/pages/Applications/profileStep/profileStepValidation.tsx b/apps/web/src/pages/Applications/profileStep/profileStepValidation.tsx
index 555c3b88644..37ab85a4ce0 100644
--- a/apps/web/src/pages/Applications/profileStep/profileStepValidation.tsx
+++ b/apps/web/src/pages/Applications/profileStep/profileStepValidation.tsx
@@ -6,13 +6,11 @@ import {
   governmentInformationSectionHasEmptyRequiredFields,
   languageInformationSectionHasEmptyRequiredFields,
   languageInformationSectionHasUnsatisfiedRequirements,
-  workLocationSectionHasEmptyRequiredFields,
   workPreferencesSectionHasEmptyRequiredFields,
   PartialUserAbout,
   PartialUserDei,
   PartialUserGovernment,
   PartialUserLanguage,
-  PartialUserLocation,
   PartialUserPreferences,
 } from "~/validators/profile";
 
@@ -20,13 +18,11 @@ type PartialUser = PartialUserAbout &
   PartialUserDei &
   PartialUserGovernment &
   PartialUserLanguage &
-  PartialUserLocation &
   PartialUserPreferences;
 
 const stepHasError = (user: PartialUser, pool: Pool) => {
   const hasEmptyRequiredFields =
     aboutSectionHasEmptyRequiredFields(user) ||
-    workLocationSectionHasEmptyRequiredFields(user) ||
     diversityEquityInclusionSectionHasEmptyRequiredFields(user, pool) ||
     governmentInformationSectionHasEmptyRequiredFields(user) ||
     languageInformationSectionHasEmptyRequiredFields(user) ||
diff --git a/apps/web/src/pages/PoolCandidates/ViewPoolCandidatePage/components/ApplicationInformation/ApplicationInformation.tsx b/apps/web/src/pages/PoolCandidates/ViewPoolCandidatePage/components/ApplicationInformation/ApplicationInformation.tsx
index 17c1e26f56f..dad0d11799d 100644
--- a/apps/web/src/pages/PoolCandidates/ViewPoolCandidatePage/components/ApplicationInformation/ApplicationInformation.tsx
+++ b/apps/web/src/pages/PoolCandidates/ViewPoolCandidatePage/components/ApplicationInformation/ApplicationInformation.tsx
@@ -27,6 +27,7 @@ import WorkPreferencesDisplay from "~/components/Profile/components/WorkPreferen
 import { categorizeSkill, groupPoolSkillByType } from "~/utils/skillUtils";
 import applicationMessages from "~/messages/applicationMessages";
 import processMessages from "~/messages/processMessages";
+import { getLabels } from "~/components/Profile/components/WorkPreferences/utils";
 
 import EducationRequirementsDisplay from "./EducationRequirementsDisplay";
 import SkillDisplay from "./SkillDisplay";
@@ -356,7 +357,7 @@ const ApplicationInformation = ({
             {intl.formatMessage(navigationMessages.workPreferences)}
           </Accordion.Trigger>
           <Accordion.Content>
-            <WorkPreferencesDisplay user={snapshot} />
+            <WorkPreferencesDisplay user={snapshot} labels={getLabels(intl)} />
           </Accordion.Content>
         </Accordion.Item>
         <Accordion.Item value={SECTION_KEY.GOV_INFO}>
diff --git a/apps/web/src/pages/ProfileAndApplicationsPage/components/ProfileAndApplicationsHeading.tsx b/apps/web/src/pages/ProfileAndApplicationsPage/components/ProfileAndApplicationsHeading.tsx
index 2ca32b36f74..e3e696a626d 100644
--- a/apps/web/src/pages/ProfileAndApplicationsPage/components/ProfileAndApplicationsHeading.tsx
+++ b/apps/web/src/pages/ProfileAndApplicationsPage/components/ProfileAndApplicationsHeading.tsx
@@ -30,7 +30,6 @@ import {
   aboutSectionHasEmptyRequiredFields,
   governmentInformationSectionHasEmptyRequiredFields,
   languageInformationSectionHasEmptyRequiredFields,
-  workLocationSectionHasEmptyRequiredFields,
   workPreferencesSectionHasEmptyRequiredFields,
 } from "~/validators/profile";
 import {
@@ -428,7 +427,6 @@ const DashboardHeading = ({ userQuery }: DashboardHeadingProps) => {
             layout="hero"
             title={intl.formatMessage(navigationMessages.workPreferences)}
             status={
-              workLocationSectionHasEmptyRequiredFields(user) ||
               workPreferencesSectionHasEmptyRequiredFields(user)
                 ? "error"
                 : "success"
diff --git a/apps/web/src/utils/userUtils.ts b/apps/web/src/utils/userUtils.ts
index 1289c02c8aa..04a60b620ec 100644
--- a/apps/web/src/utils/userUtils.ts
+++ b/apps/web/src/utils/userUtils.ts
@@ -6,6 +6,7 @@ import {
   CandidateSuspendedFilter,
   LanguageAbility,
   LocalizedEvaluatedLanguageAbility,
+  LocalizedProvinceOrTerritory,
   Maybe,
   OperationalRequirement,
   PoolCandidateStatus,
@@ -13,7 +14,7 @@ import {
   PriorityWeight,
   WorkRegion,
 } from "@gc-digital-talent/graphql";
-import { getLocalizedName } from "@gc-digital-talent/i18n";
+import { commonMessages, getLocalizedName } from "@gc-digital-talent/i18n";
 
 // convert string type to Enum types for various selections
 export function stringToEnumLanguage(
@@ -122,3 +123,25 @@ export const getEvaluatedLanguageLevels = (
     verbalLevel?.label ? getLocalizedName(verbalLevel.label, intl) : "",
   ].join(", ");
 };
+
+interface FormatLocationArgs {
+  city?: Maybe<string>;
+  region?: Maybe<LocalizedProvinceOrTerritory>;
+  intl: IntlShape;
+}
+
+export const formatLocation = ({
+  city,
+  region,
+  intl,
+}: FormatLocationArgs): string => {
+  if (city && region?.label) {
+    return `${city}, ${getLocalizedName(region.label, intl)}`;
+  }
+
+  if (city && !region) return city;
+
+  if (region && !city) return getLocalizedName(region.label, intl);
+
+  return intl.formatMessage(commonMessages.notProvided);
+};
diff --git a/apps/web/src/validators/profile/about.ts b/apps/web/src/validators/profile/about.ts
index 86f70be6a9b..de18dca6470 100644
--- a/apps/web/src/validators/profile/about.ts
+++ b/apps/web/src/validators/profile/about.ts
@@ -10,8 +10,6 @@ export type PartialUser = Pick<
   | "preferredLang"
   | "preferredLanguageForInterview"
   | "preferredLanguageForExam"
-  | "currentCity"
-  | "currentProvince"
   | "citizenship"
   | "armedForcesStatus"
 >;
@@ -22,8 +20,6 @@ export function hasAllEmptyFields({
   telephone,
   email,
   preferredLang,
-  currentCity,
-  currentProvince,
   citizenship,
   armedForcesStatus,
 }: PartialUser): boolean {
@@ -33,8 +29,6 @@ export function hasAllEmptyFields({
     !email &&
     !telephone &&
     !preferredLang &&
-    !currentCity &&
-    !currentProvince &&
     !citizenship &&
     empty(armedForcesStatus)
   );
@@ -48,8 +42,6 @@ export function hasEmptyRequiredFields({
   preferredLang,
   preferredLanguageForInterview,
   preferredLanguageForExam,
-  currentCity,
-  currentProvince,
   citizenship,
   armedForcesStatus,
 }: PartialUser): boolean {
@@ -61,8 +53,6 @@ export function hasEmptyRequiredFields({
     !preferredLang ||
     !preferredLanguageForInterview ||
     !preferredLanguageForExam ||
-    !currentCity ||
-    !currentProvince ||
     !citizenship ||
     empty(armedForcesStatus)
   );
diff --git a/apps/web/src/validators/profile/index.ts b/apps/web/src/validators/profile/index.ts
index de02aa3f0df..b4b8673aa54 100644
--- a/apps/web/src/validators/profile/index.ts
+++ b/apps/web/src/validators/profile/index.ts
@@ -15,10 +15,6 @@ import {
   hasUnsatisfiedRequirements as languageInformationSectionHasUnsatisfiedRequirements,
   type PartialUser as PartialUserLanguage,
 } from "./languageInformation";
-import {
-  hasEmptyRequiredFields as workLocationSectionHasEmptyRequiredFields,
-  type PartialUser as PartialUserLocation,
-} from "./workLocation";
 import {
   hasEmptyRequiredFields as workPreferencesSectionHasEmptyRequiredFields,
   type PartialUser as PartialUserPreferences,
@@ -34,7 +30,6 @@ export {
   governmentInformationSectionHasEmptyRequiredFields,
   languageInformationSectionHasEmptyRequiredFields,
   languageInformationSectionHasUnsatisfiedRequirements,
-  workLocationSectionHasEmptyRequiredFields,
   workPreferencesSectionHasEmptyRequiredFields,
   careerTimelineIsIncomplete,
   skillRequirementsIsIncomplete,
@@ -44,6 +39,5 @@ export {
   PartialUserDei,
   PartialUserGovernment,
   PartialUserLanguage,
-  PartialUserLocation,
   PartialUserPreferences,
 };
diff --git a/apps/web/src/validators/profile/workLocation.ts b/apps/web/src/validators/profile/workLocation.ts
deleted file mode 100644
index 255914ffe5e..00000000000
--- a/apps/web/src/validators/profile/workLocation.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import isEmpty from "lodash/isEmpty";
-
-import { User } from "@gc-digital-talent/graphql";
-
-export type PartialUser = Pick<
-  User,
-  "locationPreferences" | "locationExemptions"
->;
-
-export function anyCriteriaSelected(applicant: PartialUser): boolean {
-  return !isEmpty(applicant.locationPreferences);
-}
-
-export function hasAllEmptyFields(applicant: PartialUser): boolean {
-  return !anyCriteriaSelected(applicant);
-}
-
-export function hasEmptyRequiredFields(applicant: PartialUser): boolean {
-  return !anyCriteriaSelected(applicant);
-}
diff --git a/apps/web/src/validators/profile/workPreferences.ts b/apps/web/src/validators/profile/workPreferences.ts
index 15a3c3a286c..61daba3acb4 100644
--- a/apps/web/src/validators/profile/workPreferences.ts
+++ b/apps/web/src/validators/profile/workPreferences.ts
@@ -4,15 +4,38 @@ import { User } from "@gc-digital-talent/graphql";
 
 export type PartialUser = Pick<
   User,
-  "acceptedOperationalRequirements" | "positionDuration"
+  | "acceptedOperationalRequirements"
+  | "positionDuration"
+  | "locationPreferences"
+  | "locationExemptions"
+  | "currentCity"
+  | "currentProvince"
 >;
 
-export function hasAllEmptyFields({ positionDuration }: PartialUser): boolean {
-  return isEmpty(positionDuration);
+export function hasAllEmptyFields({
+  positionDuration,
+  locationPreferences,
+  currentCity,
+  currentProvince,
+}: PartialUser): boolean {
+  return (
+    isEmpty(positionDuration) &&
+    isEmpty(locationPreferences) &&
+    !currentCity &&
+    !currentProvince
+  );
 }
 
 export function hasEmptyRequiredFields({
   positionDuration,
+  locationPreferences,
+  currentCity,
+  currentProvince,
 }: PartialUser): boolean {
-  return isEmpty(positionDuration);
+  return (
+    isEmpty(positionDuration) ||
+    isEmpty(locationPreferences) ||
+    !currentCity ||
+    !currentProvince
+  );
 }
diff --git a/packages/i18n/src/lang/fr.json b/packages/i18n/src/lang/fr.json
index 9e061b803cc..2c17ebfbc3e 100644
--- a/packages/i18n/src/lang/fr.json
+++ b/packages/i18n/src/lang/fr.json
@@ -63,10 +63,6 @@
     "defaultMessage": "<hidden>Étape, actuelle, </hidden>{label}",
     "description": "Prefix when a step is the currently active one."
   },
-  "0gInkY": {
-    "defaultMessage": "possède <strong>des équipes de garde 24/7.</strong>",
-    "description": "The operational requirement described as 24/7 on-call."
-  },
   "0p1W7Q": {
     "defaultMessage": "Fils d’Ariane",
     "description": "Label for the links to page ancestors"
@@ -107,6 +103,10 @@
     "defaultMessage": "Vous devez ajouter au moins une exigence personnelle.",
     "description": "Message displayed when user attempts to submit a form without at least one personnel requirement"
   },
+  "2Tm9BE": {
+    "defaultMessage": "J'accepte de faire des heures supplémentaires à l'occasion.",
+    "description": "The operational requirement described as occasional overtime."
+  },
   "2W9CMn": {
     "defaultMessage": "Activer ou désactiver le contexte",
     "description": "Label to toggle the context description of a field set."
@@ -147,10 +147,6 @@
     "defaultMessage": "Agrandir tout",
     "description": "Generic link text to expand all accordions in a section"
   },
-  "4dD2mf": {
-    "defaultMessage": "cela m'oblige à faire <strong>des heures supplémentaires habituelles.</strong>",
-    "description": "The operational requirement described as regular overtime."
-  },
   "4l+gBD": {
     "defaultMessage": "Recherche...",
     "description": "Message to display when a search is being done."
@@ -159,10 +155,6 @@
     "defaultMessage": "Éliminé à la présélection",
     "description": "Screened out"
   },
-  "4mMU7Q": {
-    "defaultMessage": "cela m'oblige à faire des heures supplémentaires occasionnelles.",
-    "description": "The operational requirement described as occasional overtime."
-  },
   "4pZrst": {
     "defaultMessage": "Être disponible, disposé(e) et apte à voyager au besoin.",
     "description": "The operational requirement described as travel as required."
@@ -243,10 +235,6 @@
     "defaultMessage": "Une erreur s’est produite pendant l'attribution de rôles. Veuillez communiquer avec le personnel de soutien si le problème persiste.",
     "description": "Error message for when an error occurs during role assignment"
   },
-  "9ZyJZq": {
-    "defaultMessage": "cela m'oblige à me déplacer.",
-    "description": "The operational requirement described as travel as required."
-  },
   "9aW0M6": {
     "defaultMessage": "Ministère",
     "description": "Title for department"
@@ -255,10 +243,6 @@
     "defaultMessage": "Vous avez des modifications non sauvegardées",
     "description": "Title for unsaved changes warning on profile forms"
   },
-  "9rn/MG": {
-    "defaultMessage": "exige <strong>des quarts de travail</strong>.",
-    "description": "The operational requirement described as shift work."
-  },
   "9u6ULg": {
     "defaultMessage": "Vous avez des modifications non sauvegardées",
     "description": "Displayed next to form inputs when they have been changed but not saved."
@@ -423,6 +407,10 @@
     "defaultMessage": "La compétence du bassin n'existe pas pour le bassin en question.",
     "description": "Error message that a given pool skill is not valid."
   },
+  "I1jrAG": {
+    "defaultMessage": "Non accepté",
+    "description": "Indicates a user has not accepted some criteria"
+  },
   "IKGhHj": {
     "defaultMessage": "Important",
     "description": "Important note or caption"
@@ -507,6 +495,10 @@
     "defaultMessage": "Erreur : la suppression de la candidature a échoué",
     "description": "Message displayed to user after application fails to get deleted."
   },
+  "MAeNit": {
+    "defaultMessage": "J'accepte d'avoir un emploi dans le cadre duquel je dois transporter, soulever et déposer de l'équipement pesant jusqu'à 20 kg.",
+    "description": "The operational requirement described as transport equipment up to 20kg."
+  },
   "MBnBcY": {
     "defaultMessage": "Démonstration de compétences",
     "description": "Name of the skill showcase page"
@@ -567,6 +559,10 @@
     "defaultMessage": "Menu des options de bascule",
     "description": "Button text to toggle the combobox menu"
   },
+  "P+e8z7": {
+    "defaultMessage": "J'accepte de travailler par quarts.",
+    "description": "The operational requirement described as shift work."
+  },
   "P9roJ7": {
     "defaultMessage": "Région du Nord (Yukon, Territoires du Nord-Ouest et Nunavut)",
     "description": "The work region of Canada described as North."
@@ -575,10 +571,22 @@
     "defaultMessage": "L’article a été déplacé de {from} à {to}.",
     "description": "Message announced to assistive technology when a repeatable field has moved position"
   },
+  "PKkPSW": {
+    "defaultMessage": "J'accepte de faire des <strong>heures supplémentaires à l'occasion</strong>.",
+    "description": "The operational requirement described as occasional overtime."
+  },
   "PMwqcS": {
     "defaultMessage": "La date doit être avant ou égale au {date}",
     "description": "Error message when a date was entered that is greater than the maximum required"
   },
+  "Pj4lW9": {
+    "defaultMessage": "Accepté",
+    "description": "Indicates a user has accepted some criteria"
+  },
+  "QP+Skh": {
+    "defaultMessage": "J'accepte de faire des heures supplémentaires régulièrement.",
+    "description": "The operational requirement described as regular overtime."
+  },
   "QRXLf/": {
     "defaultMessage": "Chargement des résultats...",
     "description": "Message to display when a search is currently loading results."
@@ -675,10 +683,6 @@
     "defaultMessage": "Deux années post-secondaire",
     "description": "Option for education requirement, 2-year post-secondary"
   },
-  "TmCCgR": {
-    "defaultMessage": "cela m'oblige à d'avoir un permis de conduire valide ou un degré de mobilité personnelle habituellement associée à la possession d'un permis de conduire valide.",
-    "description": "The operational requirement described as driver's license."
-  },
   "Tw90Pi": {
     "defaultMessage": "Sauvegarde en cours...",
     "description": "Submitting text for save button."
@@ -687,6 +691,10 @@
     "defaultMessage": "Effacer votre sélection",
     "description": "Button text to reset the combobox input"
   },
+  "U3QEUu": {
+    "defaultMessage": "J'accepte d'avoir un emploi qui nécessite des déplacements.",
+    "description": "The operational requirement described as travel as required."
+  },
   "V3+fXY": {
     "defaultMessage": "L’exigence relative à l’éducation est incomplete",
     "description": "Message displayed when user attempts to apply to a pool with incomplete education requirement"
@@ -695,10 +703,6 @@
     "defaultMessage": "Retour",
     "description": "An action to go back to a previous location"
   },
-  "VYbDJk": {
-    "defaultMessage": "cela me demande de transporter, soulever et déposer des équipements pesant jusqu'à 20 kg.",
-    "description": "The operational requirement described as transport equipment up to 20kg."
-  },
   "VqrVpT": {
     "defaultMessage": "Mise à jour impossible – cette adresse courriel est déjà utilisée.",
     "description": "Error message that the given email address is already in use when updating."
@@ -763,6 +767,10 @@
     "defaultMessage": "Être disponible, disposé(e) et apte à transporter, soulever et déposer de l'équipement pouvant peser jusqu'à 20 kg.",
     "description": "The operational requirement described as transport equipment up to 20kg."
   },
+  "Y2w/me": {
+    "defaultMessage": "J'accepte d'avoir un emploi dans le cadre duquel je dois transporter, <strong>soulever et déposer de l'équipement pesant jusqu'à 20 kg</strong>.",
+    "description": "The operational requirement described as transport equipment up to 20kg."
+  },
   "Y3FL2a": {
     "defaultMessage": "Démontrée, mais la constance varie considérablement selon le public et les circonstances. Démontrée par intermittence dans des situations quotidiennes et démontrée de façon inconstante auprès de certains publics ou dans des conditions de stress ou dans des situations modérément difficiles. Le potentiel est là, mais il reste encore beaucoup à apprendre.",
     "description": "The behavioural skill level definition for beginner"
@@ -807,10 +815,6 @@
     "defaultMessage": "Jour",
     "description": "Label for a day of the month input field"
   },
-  "aAMp6e": {
-    "defaultMessage": "possède des équipes de garde 24/7.",
-    "description": "The operational requirement described as 24/7 on-call."
-  },
   "aMkZ80": {
     "defaultMessage": "Vous devez indiquer le lieu précis en anglais et en français si l’annonce ne vise pas un poste à distance.",
     "description": "Error message that advertisement locations must be filled in English and French."
@@ -863,10 +867,6 @@
     "defaultMessage": "Ce nom d’équipe est déjà utilisé",
     "description": "Error message that the given team name is already in use."
   },
-  "dIZ4oj": {
-    "defaultMessage": "m'exige de <strong>transporter, soulever et installer des équipements pesant jusqu'à 20 kg</strong>.",
-    "description": "The operational requirement described as transport equipment up to 20kg."
-  },
   "dXiRk8": {
     "defaultMessage": "Capacité démontrée à accomplir de façon constante des tâches de faible complexité sous une supervision minimale et des tâches de complexité modérée sous une forte supervision ou un mentorat direct. Généralement associée à des postes juniors ou de niveau d’entrée.",
     "description": "The technical skill level definition for beginner"
@@ -875,10 +875,6 @@
     "defaultMessage": "Veuillez entrer une adresse URL valide",
     "description": "Error message for an invalid link in the rich text editor"
   },
-  "duwt+A": {
-    "defaultMessage": "m'exige d'avoir un <strong>permis de conduire valide</strong> ou une mobilité personnelle dans la mesure normalement associée à la possession d'un permis de conduire valide.",
-    "description": "The operational requirement described as driver's license."
-  },
   "dwYJOo": {
     "defaultMessage": "Exigences en matière de travail pratique",
     "description": "Title for the applied work experience requirements"
@@ -955,10 +951,6 @@
     "defaultMessage": "Identité autochtone",
     "description": "Group for when someone indicates they are indigenous"
   },
-  "hWMUFx": {
-    "defaultMessage": "cela m'oblige à faire des heures supplémentaires habituelles.",
-    "description": "The operational requirement described as regular overtime."
-  },
   "hpBnAk": {
     "defaultMessage": "Vous ne pouvez pas désarchiver un bassin à moins que son statut indique qu'il soit archivé.",
     "description": "Error message when attempting to un-archive a pool with an invalid status."
@@ -967,6 +959,10 @@
     "defaultMessage": " : ",
     "description": "Dividing colon with trailing space"
   },
+  "iC7Wsq": {
+    "defaultMessage": "J'accepte d'avoir un emploi dans le cadre duquel je dois <strong>détenir un permis de conduire valide</strong> ou profiter d'une mobilité personnelle qui est normalement associée à la possession d'un permis de conduire valide.",
+    "description": "The operational requirement described as driver's license."
+  },
   "iSfiWx": {
     "defaultMessage": "Année",
     "description": "Label for a year input field"
@@ -987,14 +983,14 @@
     "defaultMessage": "Erreur inconnue",
     "description": "Fallback text when an error message is not supplied"
   },
+  "j47/Ct": {
+    "defaultMessage": "J'accepte d'avoir un emploi qui <strong>nécessite des déplacements</strong>.",
+    "description": "The operational requirement described as travel as required."
+  },
   "j6WJBY": {
     "defaultMessage": "{wordsLeft, plural, one {mot restant} other {mots restants}}.",
     "description": "Message for when user goes over word limit."
   },
-  "jHYaw8": {
-    "defaultMessage": "possède un travail par quarts.",
-    "description": "The operational requirement described as shift work."
-  },
   "jStpFw": {
     "defaultMessage": "Bilingue (français et anglais)",
     "description": "Name of Bilingual (English and French)"
@@ -1043,6 +1039,10 @@
     "defaultMessage": "Intégré",
     "description": "Title for in app notifications"
   },
+  "l2XtbB": {
+    "defaultMessage": "J'accepte de travailler par quarts et d'être sur appel 24 heures sur 24, 7 jours sur 7.",
+    "description": "The operational requirement described as 24/7 on-call."
+  },
   "l4wLn9": {
     "defaultMessage": "Je suis un citoyen canadien.",
     "description": "declaring one to be a Canadian citizen"
@@ -1095,6 +1095,10 @@
     "defaultMessage": "Un champ obligatoire est vide : Groupe des publications",
     "description": "Error message that the pool advertisement must have publishing group filled."
   },
+  "nVodgK": {
+    "defaultMessage": "J'accepte de faire des <strong>heures supplémentaires régulièrement</strong>.",
+    "description": "The operational requirement described as regular overtime."
+  },
   "nnMYWr": {
     "defaultMessage": "Préférences de travail",
     "description": "Name of Work preferences page"
@@ -1151,14 +1155,14 @@
     "defaultMessage": "Le bassin doit avoir une date de clôture postérieure à aujourd’hui.",
     "description": "Error message that the pool closing date isn't in the future."
   },
-  "qnYbyw": {
-    "defaultMessage": "m'exige de <strong>voyager</strong>.",
-    "description": "The operational requirement described as travel as required."
-  },
   "qtJrUr": {
     "defaultMessage": "Région de la Colombie-Britannique",
     "description": "The work region of Canada described as British Columbia."
   },
+  "quCf/v": {
+    "defaultMessage": "J'accepte de travailler <strong>par quarts</strong>.",
+    "description": "The operational requirement described as shift work."
+  },
   "quLfED": {
     "defaultMessage": "Nous avons relevé une erreur d’origine inconnue pendant le traitement de votre demande.",
     "description": "Body text for the unexpected error page."
@@ -1215,10 +1219,6 @@
     "defaultMessage": "<hidden>Erreur au niveau de l’étape, </hidden>{label}",
     "description": "Prefix when a step has an error."
   },
-  "sfhO+5": {
-    "defaultMessage": "cela m'oblige à faire <strong>des heures supplémentaires occasionnelles</strong>.",
-    "description": "The operational requirement described as occasional overtime."
-  },
   "skfKnv": {
     "defaultMessage": "Veuillez sélectionner les Premières Nations qui détiennent le statut ou les Premières Nations qui ne détiennent pas le statut.",
     "description": "Error message that the user has selected both status and non-status first nations."
@@ -1279,6 +1279,10 @@
     "defaultMessage": "<strong> Région du Nord</strong> (Yukon, Territoires du Nord-Ouest et Nunavut.)",
     "description": "The work region of Canada described as North."
   },
+  "uu2OuP": {
+    "defaultMessage": "J'accepte d'avoir un emploi dans le cadre duquel je dois détenir un permis de conduire valide ou profiter d'une mobilité personnelle qui est normalement associée à la possession d'un permis de conduire valide.",
+    "description": "The operational requirement described as driver's license."
+  },
   "v6T4Y0": {
     "defaultMessage": "Ce champ ne peut pas utiliser de dates dans le futur.",
     "description": "Error message that the date cannot be in the future."
@@ -1303,6 +1307,10 @@
     "defaultMessage": "Je ne suis pas membre des Forces armées canadiennes.",
     "description": "declare self to not be in the CAF without bolding"
   },
+  "vpTBA0": {
+    "defaultMessage": "J'accepte de travailler <strong>par quarts et d'être sur appel 24 heures sur 24, 7 jours sur 7</strong>.",
+    "description": "The operational requirement described as 24/7 on-call."
+  },
   "vvtqRv": {
     "defaultMessage": "Être disponible, disposé(e) et apte à travailler des heures supplémentaires (régulièrement).",
     "description": "The operational requirement described as regular overtime."
diff --git a/packages/i18n/src/messages/commonMessages.ts b/packages/i18n/src/messages/commonMessages.ts
index 576c20500d4..108a2581db0 100644
--- a/packages/i18n/src/messages/commonMessages.ts
+++ b/packages/i18n/src/messages/commonMessages.ts
@@ -300,6 +300,16 @@ const commonMessages = defineMessages({
     id: "m0iNdp",
     description: "Null selection for community select input.",
   },
+  accepted: {
+    defaultMessage: "Accepted",
+    id: "Pj4lW9",
+    description: "Indicates a user has accepted some criteria",
+  },
+  notAccepted: {
+    defaultMessage: "Not accepted",
+    id: "I1jrAG",
+    description: "Indicates a user has not accepted some criteria",
+  },
 });
 
 export default commonMessages;
diff --git a/packages/i18n/src/messages/localizedConstants.tsx b/packages/i18n/src/messages/localizedConstants.tsx
index c350d18f16a..0b57ea7a6a9 100644
--- a/packages/i18n/src/messages/localizedConstants.tsx
+++ b/packages/i18n/src/messages/localizedConstants.tsx
@@ -380,87 +380,91 @@ export const getWorkRegionsDetailed = (
   );
 
 const operationalRequirementLabelFirstPerson = defineMessages({
+  [OperationalRequirement.OvertimeOccasional]: {
+    defaultMessage:
+      "I am willing to work <strong>occasional overtime</strong>.",
+    id: "PKkPSW",
+    description:
+      "The operational requirement described as occasional overtime.",
+  },
+  [OperationalRequirement.OvertimeRegular]: {
+    defaultMessage: "I am willing to work <strong>regular overtime</strong>.",
+    id: "nVodgK",
+    description: "The operational requirement described as regular overtime.",
+  },
   [OperationalRequirement.ShiftWork]: {
-    defaultMessage: "has <strong>shift-work</strong>.",
-    id: "9rn/MG",
+    defaultMessage:
+      "I am willing to work a job with <strong>shift-work</strong>.",
+    id: "quCf/v",
     description: "The operational requirement described as shift work.",
   },
   [OperationalRequirement.OnCall]: {
-    defaultMessage: "has <strong>24/7 on-call shifts</strong>.",
-    id: "0gInkY",
+    defaultMessage:
+      "I am willing to work a job that has <strong>24/7 on-call shifts</strong>.",
+    id: "vpTBA0",
     description: "The operational requirement described as 24/7 on-call.",
   },
   [OperationalRequirement.Travel]: {
-    defaultMessage: "requires me to <strong>travel</strong>.",
-    id: "qnYbyw",
+    defaultMessage:
+      "I am willing to work a job that <strong>requires travel</strong>.",
+    id: "j47/Ct",
     description: "The operational requirement described as travel as required.",
   },
   [OperationalRequirement.TransportEquipment]: {
     defaultMessage:
-      "requires me to <strong>transport, lift and set down equipment weighing up to 20kg</strong>.",
-    id: "dIZ4oj",
+      "I am willing to work a job that requires me to <strong>transport, lift and set down equipment weighing up to 20kg</strong>.",
+    id: "Y2w/me",
     description:
       "The operational requirement described as transport equipment up to 20kg.",
   },
   [OperationalRequirement.DriversLicense]: {
     defaultMessage:
-      "requires me to <strong>have a valid driver's license</strong> or personal mobility to the degree normally associated with the possession of a valid driver's license.",
-    id: "duwt+A",
+      "I am willing to work a job that requires me to <strong>have a valid driver's license</strong> or personal mobility to the degree normally associated with the possession of a valid driver's license.",
+    id: "iC7Wsq",
     description: "The operational requirement described as driver's license.",
   },
+});
+
+const operationalRequirementLabelFirstPersonNoBold = defineMessages({
   [OperationalRequirement.OvertimeOccasional]: {
-    defaultMessage: "requires me to work <strong>occasional overtime</strong>.",
-    id: "sfhO+5",
+    defaultMessage: "I am willing to work occasional overtime.",
+    id: "2Tm9BE",
     description:
       "The operational requirement described as occasional overtime.",
   },
   [OperationalRequirement.OvertimeRegular]: {
-    defaultMessage: "requires me to work <strong>regular overtime</strong>.",
-    id: "4dD2mf",
+    defaultMessage: "I am willing to work regular overtime.",
+    id: "QP+Skh",
     description: "The operational requirement described as regular overtime.",
   },
-});
-
-const operationalRequirementLabelFirstPersonNoBold = defineMessages({
   [OperationalRequirement.ShiftWork]: {
-    defaultMessage: "has shift-work.",
-    id: "jHYaw8",
+    defaultMessage: "I am willing to work a job with shift-work.",
+    id: "P+e8z7",
     description: "The operational requirement described as shift work.",
   },
   [OperationalRequirement.OnCall]: {
-    defaultMessage: "has 24/7 on-call shifts.",
-    id: "aAMp6e",
+    defaultMessage: "I am willing to work a job that has 24/7 on-call shifts.",
+    id: "l2XtbB",
     description: "The operational requirement described as 24/7 on-call.",
   },
   [OperationalRequirement.Travel]: {
-    defaultMessage: "requires me to travel.",
-    id: "9ZyJZq",
+    defaultMessage: "I am willing to work a job that requires me to travel.",
+    id: "U3QEUu",
     description: "The operational requirement described as travel as required.",
   },
   [OperationalRequirement.TransportEquipment]: {
     defaultMessage:
-      "requires me to transport, lift and set down equipment weighing up to 20kg.",
-    id: "VYbDJk",
+      "I am willing to work a job that requires me to transport, lift and set down equipment weighing up to 20kg.",
+    id: "MAeNit",
     description:
       "The operational requirement described as transport equipment up to 20kg.",
   },
   [OperationalRequirement.DriversLicense]: {
     defaultMessage:
-      "requires me to have a valid driver's license or personal mobility to the degree normally associated with the possession of a valid driver's license.",
-    id: "TmCCgR",
+      "I am willing to work a job that requires me to have a valid driver's license or personal mobility to the degree normally associated with the possession of a valid driver's license.",
+    id: "uu2OuP",
     description: "The operational requirement described as driver's license.",
   },
-  [OperationalRequirement.OvertimeOccasional]: {
-    defaultMessage: "requires me to work occasional overtime.",
-    id: "4mMU7Q",
-    description:
-      "The operational requirement described as occasional overtime.",
-  },
-  [OperationalRequirement.OvertimeRegular]: {
-    defaultMessage: "requires me to work regular overtime.",
-    id: "hWMUFx",
-    description: "The operational requirement described as regular overtime.",
-  },
 });
 
 export const OperationalRequirements = [