diff --git a/pages/accountLists/[accountListId]/settings/preferences.page.test.tsx b/pages/accountLists/[accountListId]/settings/preferences.page.test.tsx
index ad314571d4..1879ddc62d 100644
--- a/pages/accountLists/[accountListId]/settings/preferences.page.test.tsx
+++ b/pages/accountLists/[accountListId]/settings/preferences.page.test.tsx
@@ -286,9 +286,20 @@ describe('Preferences page', () => {
         ),
       ).toBeInTheDocument();
 
-      // Home Country
+      // Geographic Location
       const skipButton = getByRole('button', { name: 'Skip Step' });
       userEvent.click(skipButton);
+      expect(
+        await findByText('Are you within 50 miles of a major city?'),
+      ).toBeInTheDocument();
+      expect(
+        await findByText(
+          'This should be the major city within 50 miles of you. If none apply, leave this blank.',
+        ),
+      ).toBeInTheDocument();
+
+      // Home Country
+      userEvent.click(skipButton);
       expect(
         await findByText(
           'This should be the place from which you are living and sending out physical communications. This will be used in exports for mailing address information.',
diff --git a/pages/accountLists/[accountListId]/settings/preferences.page.tsx b/pages/accountLists/[accountListId]/settings/preferences.page.tsx
index 974d80faf6..87f25d8edf 100644
--- a/pages/accountLists/[accountListId]/settings/preferences.page.tsx
+++ b/pages/accountLists/[accountListId]/settings/preferences.page.tsx
@@ -16,6 +16,7 @@ import { CurrencyAccordion } from 'src/components/Settings/preferences/accordion
 import { DefaultAccountAccordion } from 'src/components/Settings/preferences/accordions/DefaultAccountAccordion/DefaultAccountAccordion';
 import { EarlyAdopterAccordion } from 'src/components/Settings/preferences/accordions/EarlyAdopterAccordion/EarlyAdopterAccordion';
 import { ExportAllDataAccordion } from 'src/components/Settings/preferences/accordions/ExportAllDataAccordion/ExportAllDataAccordion';
+import { GeographicLocationAccordion } from 'src/components/Settings/preferences/accordions/GeographicLocationAccordion/GeographicLocationAccordion';
 import { HomeCountryAccordion } from 'src/components/Settings/preferences/accordions/HomeCountryAccordion/HomeCountryAccordion';
 import { HourToSendNotificationsAccordion } from 'src/components/Settings/preferences/accordions/HourToSendNotificationsAccordion/HourToSendNotificationsAccordion';
 import { LanguageAccordion } from 'src/components/Settings/preferences/accordions/LanguageAccordion/LanguageAccordion';
@@ -51,6 +52,7 @@ const Preferences: React.FC = () => {
   const setupAccordions = [
     PreferenceAccordion.Locale,
     PreferenceAccordion.MonthlyGoal,
+    PreferenceAccordion.GeographicLocation,
     PreferenceAccordion.HomeCountry,
   ];
   const [setup, setSetup] = useState(0);
@@ -139,6 +141,8 @@ const Preferences: React.FC = () => {
       case 1:
         return t('Great progress comes from great goals!');
       case 2:
+        return t('Are you within 50 miles of a major city?');
+      case 3:
         return t('What country are you in?');
       default:
         return '';
@@ -254,6 +258,17 @@ const Preferences: React.FC = () => {
               disabled={onSetupTour && setup !== 1}
               handleSetupChange={handleSetupChange}
             />
+            <GeographicLocationAccordion
+              handleAccordionChange={setExpandedAccordion}
+              expandedAccordion={expandedAccordion}
+              geographicLocation={
+                accountPreferencesData?.accountList?.settings
+                  ?.geographicLocation || ''
+              }
+              accountListId={accountListId}
+              disabled={onSetupTour && setup !== 2}
+              handleSetupChange={handleSetupChange}
+            />
             <HomeCountryAccordion
               handleAccordionChange={setExpandedAccordion}
               expandedAccordion={expandedAccordion}
@@ -262,7 +277,7 @@ const Preferences: React.FC = () => {
               }
               accountListId={accountListId}
               countries={countries}
-              disabled={onSetupTour && setup !== 2}
+              disabled={onSetupTour && setup !== 3}
               handleSetupChange={handleSetupChange}
             />
             <CurrencyAccordion
diff --git a/src/components/HrTools/GoalCalculator/CalculatorSettings/Categories/InformationCategory/InformationCategoryForm/InformationCategoryPersonalForm.tsx b/src/components/HrTools/GoalCalculator/CalculatorSettings/Categories/InformationCategory/InformationCategoryForm/InformationCategoryPersonalForm.tsx
index dfbe6f6792..09dedfaec5 100644
--- a/src/components/HrTools/GoalCalculator/CalculatorSettings/Categories/InformationCategory/InformationCategoryForm/InformationCategoryPersonalForm.tsx
+++ b/src/components/HrTools/GoalCalculator/CalculatorSettings/Categories/InformationCategory/InformationCategoryForm/InformationCategoryPersonalForm.tsx
@@ -12,6 +12,7 @@ import { range } from 'lodash';
 import { useTranslation } from 'react-i18next';
 import * as yup from 'yup';
 import { useGoalCalculator } from 'src/components/HrTools/GoalCalculator/Shared/GoalCalculatorContext';
+import { LocationInfoAlert } from 'src/components/HrTools/Shared/LocationInfoAlert/LocationInfoAlert';
 import {
   GoalCalculationAge,
   GoalCalculationRole,
@@ -170,6 +171,7 @@ export const InformationCategoryPersonalForm: React.FC<
                 />
               )}
             />
+            <LocationInfoAlert />
           </Grid>
         )}
 
diff --git a/src/components/HrTools/GoalCalculator/GoalCalculatorTestWrapper.tsx b/src/components/HrTools/GoalCalculator/GoalCalculatorTestWrapper.tsx
index 2b7ed409c5..5656e81d3f 100644
--- a/src/components/HrTools/GoalCalculator/GoalCalculatorTestWrapper.tsx
+++ b/src/components/HrTools/GoalCalculator/GoalCalculatorTestWrapper.tsx
@@ -13,6 +13,7 @@ import {
   PrimaryBudgetCategoryEnum,
   SubBudgetCategoryEnum,
 } from 'src/graphql/types.generated';
+import { AccountGeographicLocationQuery } from 'src/hooks/AccountGeographicLocation.generated';
 import {
   GoalCalculatorConstantsDocument,
   GoalCalculatorConstantsQuery,
@@ -338,21 +339,24 @@ interface MockedGoalCalculatorTestWrapperProps {
    * mock every year with the static `constantsMock`.
    */
   constantsByYear?: Record<number, GoalCalculatorConstantsQuery['constant']>;
+  /** The account's currently saved geographic location preference. */
+  accountGeographicLocation?: string | null;
   children?: React.ReactNode;
 }
 
 interface NoMocksGoalCalculatorTestWrapperProps {
   /**
    * Skip the `GqlMockedProvider` entirely (the test supplies its own Apollo
-   * provider). `onCall`, `readOnly`, `goalCalculation`, and `constantsByYear`
-   * only configure the mocked provider, so they are disallowed here — they
-   * would silently no-op.
+   * provider). `onCall`, `readOnly`, `goalCalculation`, `constantsByYear`, and
+   * `accountGeographicLocation` only configure the mocked provider, so they
+   * are disallowed here — they would silently no-op.
    */
   noMocks: true;
   onCall?: never;
   readOnly?: never;
   goalCalculation?: never;
   constantsByYear?: never;
+  accountGeographicLocation?: never;
   children?: React.ReactNode;
 }
 
@@ -368,6 +372,7 @@ export const GoalCalculatorTestWrapper: React.FC<
   readOnly = false,
   goalCalculation = goalCalculationMock,
   constantsByYear,
+  accountGeographicLocation = null,
   children,
 }) => {
   const content = <GoalCalculatorProvider>{children}</GoalCalculatorProvider>;
@@ -388,6 +393,7 @@ export const GoalCalculatorTestWrapper: React.FC<
             <GqlMockedProvider<{
               GoalCalculation: GoalCalculationQuery;
               GoalCalculatorConstants: GoalCalculatorConstantsQuery;
+              AccountGeographicLocation: AccountGeographicLocationQuery;
             }>
               mocks={{
                 GoalCalculation: {
@@ -400,6 +406,13 @@ export const GoalCalculatorTestWrapper: React.FC<
                     ? mockConstantsByYear(constantsByYear)
                     : constantsMock,
                 },
+                AccountGeographicLocation: {
+                  accountList: {
+                    settings: {
+                      geographicLocation: accountGeographicLocation,
+                    },
+                  },
+                },
               }}
               onCall={onCall}
             >
diff --git a/src/components/HrTools/GoalCalculator/SummaryReport/Steps/PresentingYourGoalStep/GoalApplicationButtonGroup.test.tsx b/src/components/HrTools/GoalCalculator/SummaryReport/Steps/PresentingYourGoalStep/GoalApplicationButtonGroup.test.tsx
index d901339b4f..038b471016 100644
--- a/src/components/HrTools/GoalCalculator/SummaryReport/Steps/PresentingYourGoalStep/GoalApplicationButtonGroup.test.tsx
+++ b/src/components/HrTools/GoalCalculator/SummaryReport/Steps/PresentingYourGoalStep/GoalApplicationButtonGroup.test.tsx
@@ -1,12 +1,24 @@
 import React from 'react';
 import { render, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { GoalCalculatorTestWrapper } from '../../../GoalCalculatorTestWrapper';
+import {
+  GoalCalculatorTestWrapper,
+  goalCalculationMock,
+} from '../../../GoalCalculatorTestWrapper';
 import { GoalApplicationButtonGroup } from './GoalApplicationButtonGroup';
 
 const mutationSpy = jest.fn();
-const TestComponent: React.FC = () => (
-  <GoalCalculatorTestWrapper onCall={mutationSpy}>
+const TestComponent: React.FC<{ geographicLocation?: string | null }> = ({
+  geographicLocation,
+}) => (
+  <GoalCalculatorTestWrapper
+    onCall={mutationSpy}
+    goalCalculation={
+      geographicLocation === undefined
+        ? goalCalculationMock
+        : { ...goalCalculationMock, geographicLocation }
+    }
+  >
     <GoalApplicationButtonGroup />
   </GoalCalculatorTestWrapper>
 );
@@ -65,4 +77,32 @@ describe('GoalApplicationButtonGroup', () => {
       await findByText('Successfully updated your monthly goal to $16,139!'),
     ).toBeInTheDocument();
   });
+
+  it('sends geographicLocation when the goal calculation has one', async () => {
+    const { getByRole, findByText } = render(
+      <TestComponent geographicLocation="Miami, FL" />,
+    );
+
+    const applyButton = getByRole('button', { name: /apply goal to mpdx/i });
+    await waitFor(() => expect(applyButton).toBeEnabled());
+    userEvent.click(applyButton);
+
+    await waitFor(() =>
+      expect(mutationSpy).toHaveGraphqlOperation('UpdateAccountPreferences', {
+        input: {
+          id: 'account-list-1',
+          attributes: {
+            id: 'account-list-1',
+            settings: { geographicLocation: 'Miami, FL' },
+          },
+        },
+      }),
+    );
+
+    expect(
+      await findByText(
+        'Successfully updated your monthly goal to $16,139 and geographic location to Miami, FL!',
+      ),
+    ).toBeInTheDocument();
+  });
 });
diff --git a/src/components/HrTools/GoalCalculator/SummaryReport/Steps/PresentingYourGoalStep/GoalApplicationButtonGroup.tsx b/src/components/HrTools/GoalCalculator/SummaryReport/Steps/PresentingYourGoalStep/GoalApplicationButtonGroup.tsx
index f850f11b7d..90a7ea8507 100644
--- a/src/components/HrTools/GoalCalculator/SummaryReport/Steps/PresentingYourGoalStep/GoalApplicationButtonGroup.tsx
+++ b/src/components/HrTools/GoalCalculator/SummaryReport/Steps/PresentingYourGoalStep/GoalApplicationButtonGroup.tsx
@@ -1,50 +1,26 @@
 import React, { useState } from 'react';
 import { Button, CircularProgress, Stack } from '@mui/material';
-import { useSnackbar } from 'notistack';
 import { useTranslation } from 'react-i18next';
-import { useUpdateAccountPreferencesMutation } from 'src/components/Settings/preferences/accordions/UpdateAccountPreferences.generated';
-import { useAccountListId } from 'src/hooks/useAccountListId';
-import { useLocale } from 'src/hooks/useLocale';
-import { currencyFormat } from 'src/lib/intlFormat';
+import { useApplyGoalAndLocation } from 'src/hooks/useApplyGoalAndLocation';
 import { useGoalCalculator } from '../../../Shared/GoalCalculatorContext';
 
 export const GoalApplicationButtonGroup: React.FC = () => {
   const { t } = useTranslation();
-  const locale = useLocale();
-  const { enqueueSnackbar } = useSnackbar();
   const {
     goalCalculationResult,
     goalTotals: { overallTotal },
     constants,
   } = useGoalCalculator();
   const monthlyGoal = Math.round(overallTotal);
-  const [updateAccountPreferences, { loading }] =
-    useUpdateAccountPreferencesMutation();
-  const accountListId = useAccountListId() || '';
+  const geographicLocation =
+    goalCalculationResult.data?.goalCalculation?.geographicLocation ?? null;
+  const { applyMonthlyGoal, loading } =
+    useApplyGoalAndLocation(geographicLocation);
   const [buttonsHidden, setButtonsHidden] = useState(false);
 
   const onSave = async () => {
-    await updateAccountPreferences({
-      variables: {
-        input: {
-          id: accountListId,
-          attributes: {
-            id: accountListId,
-            settings: { monthlyGoal },
-          },
-        },
-      },
-      onCompleted: () => {
-        enqueueSnackbar(
-          t('Successfully updated your monthly goal to {{formattedTotal}}!', {
-            formattedTotal: currencyFormat(monthlyGoal, 'USD', locale),
-          }),
-          {
-            variant: 'success',
-          },
-        );
-      },
-    });
+    await applyMonthlyGoal(monthlyGoal);
+    setButtonsHidden(true);
   };
 
   if (buttonsHidden) {
@@ -62,10 +38,7 @@ export const GoalApplicationButtonGroup: React.FC = () => {
     >
       <Button
         variant="contained"
-        onClick={() => {
-          onSave();
-          setButtonsHidden(true);
-        }}
+        onClick={onSave}
         disabled={
           goalCalculationResult.loading ||
           // Without the year's constants the total would be understated, so
diff --git a/src/components/HrTools/NsoMpdQuestionnaire/NsoMpdQuestionnaireTestWrapper.tsx b/src/components/HrTools/NsoMpdQuestionnaire/NsoMpdQuestionnaireTestWrapper.tsx
index ffdd136f59..09f1dc42fe 100644
--- a/src/components/HrTools/NsoMpdQuestionnaire/NsoMpdQuestionnaireTestWrapper.tsx
+++ b/src/components/HrTools/NsoMpdQuestionnaire/NsoMpdQuestionnaireTestWrapper.tsx
@@ -10,6 +10,7 @@ import {
   GoalCalculationAge,
   NewStaffQuestionnaireMaritalStatusEnum,
 } from 'src/graphql/types.generated';
+import { AccountGeographicLocationQuery } from 'src/hooks/AccountGeographicLocation.generated';
 import { GoalCalculatorConstantsQuery } from 'src/hooks/goalCalculatorConstants.generated';
 import theme from 'src/theme';
 import { MinistriesQuery } from './MinistryInformation/Ministries.generated';
@@ -59,6 +60,8 @@ export interface NsoMpdQuestionnaireTestWrapperProps {
   mockPush?: jest.Mock;
   /** Override the OneApp ministries list, e.g. `[]` to exercise the load-failure state. */
   ministries?: MinistryMock[];
+  /** The account's saved Geographic Location preference. Defaults to null. */
+  accountGeographicLocation?: string | null;
   children?: React.ReactNode;
 }
 
@@ -70,6 +73,7 @@ export const NsoMpdQuestionnaireTestWrapper: React.FC<
   onCall,
   mockPush,
   ministries = defaultMinistries,
+  accountGeographicLocation = null,
   children,
 }) => {
   return (
@@ -80,11 +84,19 @@ export const NsoMpdQuestionnaireTestWrapper: React.FC<
           GoalCalculatorConstants: GoalCalculatorConstantsQuery;
           NewStaffQuestionnaire: NewStaffQuestionnaireQuery;
           Ministries: MinistriesQuery;
+          AccountGeographicLocation: AccountGeographicLocationQuery;
         }>
           mocks={{
             GetUser: {
               user: { avatar: 'avatar.jpg', staffAccountId: '000123456' },
             },
+            AccountGeographicLocation: {
+              accountList: {
+                settings: {
+                  geographicLocation: accountGeographicLocation,
+                },
+              },
+            },
             NewStaffQuestionnaire: {
               newStaffQuestionnaire:
                 newStaffQuestionnaire === null
diff --git a/src/components/HrTools/NsoMpdQuestionnaire/Summary/Summary.test.tsx b/src/components/HrTools/NsoMpdQuestionnaire/Summary/Summary.test.tsx
index 8f047673f1..745b3daef8 100644
--- a/src/components/HrTools/NsoMpdQuestionnaire/Summary/Summary.test.tsx
+++ b/src/components/HrTools/NsoMpdQuestionnaire/Summary/Summary.test.tsx
@@ -240,4 +240,79 @@ describe('Summary', () => {
     await waitFor(() => expect(submitButton).toBeEnabled());
     expect(queryByRole('alert')).not.toBeInTheDocument();
   });
+
+  describe('Geographic location preference', () => {
+    it('shows info alert and updates the account preference when it differs', async () => {
+      const { findByRole, getByRole, findByText } = render(
+        <TestComponent
+          onCall={mutationSpy}
+          newStaffQuestionnaire={{
+            ...filledDebtFields,
+            geographicLocation: 'Miami, FL',
+          }}
+          accountGeographicLocation="Atlanta, GA"
+        />,
+      );
+      const submitButton = await findByRole('button', { name: 'Submit' });
+      await waitFor(() => expect(submitButton).toBeEnabled());
+      userEvent.click(submitButton);
+
+      expect(
+        await findByText(
+          'Your geographic location will be updated to Miami, FL in your account settings.',
+        ),
+      ).toBeInTheDocument();
+
+      const dialog = getByRole('dialog');
+      userEvent.click(within(dialog).getByRole('button', { name: 'Submit' }));
+
+      await waitFor(() =>
+        expect(mutationSpy).toHaveGraphqlOperation('UpdateAccountPreferences', {
+          input: {
+            id: 'account-list-1',
+            attributes: {
+              id: 'account-list-1',
+              settings: { geographicLocation: 'Miami, FL' },
+            },
+          },
+        }),
+      );
+    });
+
+    it('does not show info alert or update the preference when it already matches', async () => {
+      const { findByRole, queryByText } = render(
+        <TestComponent
+          onCall={mutationSpy}
+          newStaffQuestionnaire={{
+            ...filledDebtFields,
+            geographicLocation: 'Miami, FL',
+          }}
+          accountGeographicLocation="Miami, FL"
+        />,
+      );
+      const submitButton = await findByRole('button', { name: 'Submit' });
+      await waitFor(() => expect(submitButton).toBeEnabled());
+      userEvent.click(submitButton);
+
+      const dialog = await findByRole('dialog');
+      await waitFor(() =>
+        expect(
+          queryByText(
+            'Your geographic location will be updated to Miami, FL in your account settings.',
+          ),
+        ).not.toBeInTheDocument(),
+      );
+
+      userEvent.click(within(dialog).getByRole('button', { name: 'Submit' }));
+
+      await waitFor(() =>
+        expect(mutationSpy).toHaveGraphqlOperation(
+          'CompleteNewStaffQuestionnaire',
+        ),
+      );
+      expect(mutationSpy).not.toHaveGraphqlOperation(
+        'UpdateAccountPreferences',
+      );
+    });
+  });
 });
diff --git a/src/components/HrTools/NsoMpdQuestionnaire/Summary/Summary.tsx b/src/components/HrTools/NsoMpdQuestionnaire/Summary/Summary.tsx
index 1c4f832bf8..f02346b7d6 100644
--- a/src/components/HrTools/NsoMpdQuestionnaire/Summary/Summary.tsx
+++ b/src/components/HrTools/NsoMpdQuestionnaire/Summary/Summary.tsx
@@ -5,6 +5,7 @@ import { useSnackbar } from 'notistack';
 import { useTranslation } from 'react-i18next';
 import { Confirmation } from 'src/components/Shared/Modal/Confirmation/Confirmation';
 import { useAccountListId } from 'src/hooks/useAccountListId';
+import { useApplyGoalAndLocation } from 'src/hooks/useApplyGoalAndLocation';
 import { BackButton } from '../Shared/BackButton';
 import { useNsoMpdQuestionnaire } from '../Shared/NsoMpdQuestionnaireContext';
 import { NsoMpdQuestionnaireLayout } from '../Shared/NsoMpdQuestionnaireLayout';
@@ -30,15 +31,42 @@ export const Summary: React.FC = () => {
     incompleteSteps.includes(section.step),
   );
 
+  const {
+    applyMonthlyGoal,
+    geographicLocationChanged,
+    normalizedGeographicLocation,
+  } = useApplyGoalAndLocation(questionnaire?.geographicLocation ?? null);
+
   // Complete the questionnaire, then redirect to the dashboard on success.
   const handleSubmit = async () => {
     await completeQuestionnaire();
+
+    if (geographicLocationChanged) {
+      applyMonthlyGoal();
+    }
+
     enqueueSnackbar(t('Questionnaire submitted successfully.'), {
       variant: 'success',
     });
     await router.push(`/accountLists/${accountListId}`);
   };
 
+  const message = (
+    <>
+      {t(
+        "Once you submit, you won't be able to make any more changes. Do you want to continue?",
+      )}
+      {geographicLocationChanged && (
+        <Alert severity="info" sx={{ mt: 2 }}>
+          {t(
+            'Your geographic location will be updated to {{geographicLocation}} in your account settings.',
+            { geographicLocation: normalizedGeographicLocation },
+          )}
+        </Alert>
+      )}
+    </>
+  );
+
   return (
     <NsoMpdQuestionnaireLayout>
       <Box mx={4} my={2}>
@@ -95,9 +123,7 @@ export const Summary: React.FC = () => {
       <Confirmation
         isOpen={confirmOpen}
         title={t('Submit Questionnaire')}
-        message={t(
-          "Once you submit, you won't be able to make any more changes. Do you want to continue?",
-        )}
+        message={message}
         confirmLabel={t('Submit')}
         cancelLabel={t('Cancel')}
         mutation={handleSubmit}
diff --git a/src/components/HrTools/PdsGoalCalculator/PdsGoalCalculator.test.tsx b/src/components/HrTools/PdsGoalCalculator/PdsGoalCalculator.test.tsx
index 8e8ce73823..7dd523f417 100644
--- a/src/components/HrTools/PdsGoalCalculator/PdsGoalCalculator.test.tsx
+++ b/src/components/HrTools/PdsGoalCalculator/PdsGoalCalculator.test.tsx
@@ -370,6 +370,47 @@ describe('PdsGoalCalculator', () => {
       ).toBeInTheDocument();
     });
 
+    it('sends geographic location when the calculation has one', async () => {
+      const mutationSpy = jest.fn();
+      const { findByRole, findByText } = render(
+        <PdsGoalCalculatorTestWrapper
+          calculationMock={{
+            ...simpleFormMock,
+            geographicLocation: 'Miami, FL',
+          }}
+          onCall={mutationSpy}
+        >
+          <PdsGoalCalculator />
+        </PdsGoalCalculatorTestWrapper>,
+      );
+
+      await advanceToLastStep(findByRole);
+
+      userEvent.click(
+        await findByRole('button', { name: 'Apply Goal to MPDX' }),
+      );
+
+      await waitFor(() =>
+        expect(mutationSpy).toHaveGraphqlOperation('UpdateAccountPreferences', {
+          input: {
+            id: 'abc123',
+            attributes: {
+              id: 'abc123',
+              settings: { geographicLocation: 'Miami, FL' },
+            },
+          },
+        }),
+      );
+
+      expect(
+        await findByText(
+          `Successfully updated your monthly goal to $${EXPECTED_MONTHLY_GOAL.toLocaleString(
+            'en-US',
+          )} and geographic location to Miami, FL!`,
+        ),
+      ).toBeInTheDocument();
+    });
+
     it('keeps the Apply Goal to MPDX button disabled after a successful submission', async () => {
       const { findByRole, findByText } = render(
         <PdsGoalCalculatorTestWrapper calculationMock={simpleFormMock}>
diff --git a/src/components/HrTools/PdsGoalCalculator/PdsGoalCalculator.tsx b/src/components/HrTools/PdsGoalCalculator/PdsGoalCalculator.tsx
index e41b0f6b6a..9e34238e78 100644
--- a/src/components/HrTools/PdsGoalCalculator/PdsGoalCalculator.tsx
+++ b/src/components/HrTools/PdsGoalCalculator/PdsGoalCalculator.tsx
@@ -1,15 +1,12 @@
 import React, { useState } from 'react';
-import { useSnackbar } from 'notistack';
 import { useTranslation } from 'react-i18next';
 import { DirectionButtons } from 'src/components/HrTools/Shared/CalculationReports/DirectionButtons/DirectionButtons';
-import { useUpdateAccountPreferencesMutation } from 'src/components/Settings/preferences/accordions/UpdateAccountPreferences.generated';
 import {
   AutosaveForm,
   useAutosaveForm,
 } from 'src/components/Shared/Autosave/AutosaveForm';
 import { useAccountListId } from 'src/hooks/useAccountListId';
-import { useLocale } from 'src/hooks/useLocale';
-import { currencyFormat } from 'src/lib/intlFormat';
+import { useApplyGoalAndLocation } from 'src/hooks/useApplyGoalAndLocation';
 import { PdsGoalCalculatorStepEnum } from './PdsGoalCalculatorHelper';
 import { ReimbursableExpensesSectionList } from './ReimbursableExpenses/ReimbursableExpensesSectionList';
 import { ReimbursableExpensesStep } from './ReimbursableExpenses/ReimbursableExpensesStep';
@@ -54,8 +51,6 @@ const CurrentSectionList: React.FC = () => {
 
 const MainContent: React.FC = () => {
   const { t } = useTranslation();
-  const locale = useLocale();
-  const { enqueueSnackbar } = useSnackbar();
   const accountListId = useAccountListId();
   const {
     currentStep,
@@ -64,10 +59,12 @@ const MainContent: React.FC = () => {
     summaryData,
     handleContinue,
     handlePreviousStep,
+    calculation,
   } = usePdsGoalCalculator();
   const { allValid } = useAutosaveForm();
-  const [updateAccountPreferences, { loading: updating }] =
-    useUpdateAccountPreferencesMutation();
+  const geographicLocation = calculation?.geographicLocation ?? null;
+  const { applyMonthlyGoal, loading: updating } =
+    useApplyGoalAndLocation(geographicLocation);
   const [submitted, setSubmitted] = useState(false);
 
   const isFirstStep = stepIndex === 0;
@@ -78,27 +75,10 @@ const MainContent: React.FC = () => {
       return;
     }
     const monthlyGoal = Math.round(summaryData.overallTotal);
-    await updateAccountPreferences({
-      variables: {
-        input: {
-          id: accountListId,
-          attributes: {
-            id: accountListId,
-            settings: { monthlyGoal },
-          },
-        },
-      },
+    await applyMonthlyGoal(monthlyGoal, {
       refetchQueries: ['GetDashboard', 'GetDonationGraph'],
-      onCompleted: () => {
-        setSubmitted(true);
-        enqueueSnackbar(
-          t('Successfully updated your monthly goal to {{formattedTotal}}!', {
-            formattedTotal: currencyFormat(monthlyGoal, 'USD', locale),
-          }),
-          { variant: 'success' },
-        );
-      },
     });
+    setSubmitted(true);
   };
 
   return (
diff --git a/src/components/HrTools/PdsGoalCalculator/PdsGoalCalculatorTestWrapper.tsx b/src/components/HrTools/PdsGoalCalculator/PdsGoalCalculatorTestWrapper.tsx
index a9b7ec392b..f6e45ec564 100644
--- a/src/components/HrTools/PdsGoalCalculator/PdsGoalCalculatorTestWrapper.tsx
+++ b/src/components/HrTools/PdsGoalCalculator/PdsGoalCalculatorTestWrapper.tsx
@@ -15,6 +15,7 @@ import {
   MpdGoalMiscConstantCategoryEnum,
   MpdGoalMiscConstantLabelEnum,
 } from 'src/graphql/types.generated';
+import { AccountGeographicLocationQuery } from 'src/hooks/AccountGeographicLocation.generated';
 import { GoalCalculatorConstantsQuery } from 'src/hooks/goalCalculatorConstants.generated';
 import theme from 'src/theme';
 import { AccountListSupportRaisedQuery } from '../GoalCalculator/Shared/GoalLineItems.generated';
@@ -144,6 +145,8 @@ export interface PdsGoalCalculatorTestWrapperProps<
   userMock?: GetUserMock;
   constantsMock?: GoalCalculatorConstantsMock;
   supportRaisedMock?: number;
+  /** The account's currently saved geographic location preference. */
+  accountGeographicLocation?: string | null;
   /**
    * Extra GqlMockedProvider mocks merged on top of the defaults. Pass the
    * operation map as a generic argument so mock shapes are type-checked:
@@ -171,6 +174,7 @@ export const PdsGoalCalculatorTestWrapper = <
   userMock,
   constantsMock,
   supportRaisedMock,
+  accountGeographicLocation = null,
   extraMocks,
   onCall,
   router,
@@ -191,9 +195,17 @@ export const PdsGoalCalculatorTestWrapper = <
             HcmUser: HcmUserQuery;
             GetUser: GetUserQuery;
             AccountListSupportRaised: AccountListSupportRaisedQuery;
+            AccountGeographicLocation: AccountGeographicLocationQuery;
           }>
             mocks={merge(
               {
+                AccountGeographicLocation: {
+                  accountList: {
+                    settings: {
+                      geographicLocation: accountGeographicLocation,
+                    },
+                  },
+                },
                 PdsGoalCalculations: {
                   designationSupportCalculations: merge(
                     {},
diff --git a/src/components/HrTools/PdsGoalCalculator/Setup/SetupStep.tsx b/src/components/HrTools/PdsGoalCalculator/Setup/SetupStep.tsx
index 592b79040d..cb5909d0a6 100644
--- a/src/components/HrTools/PdsGoalCalculator/Setup/SetupStep.tsx
+++ b/src/components/HrTools/PdsGoalCalculator/Setup/SetupStep.tsx
@@ -33,6 +33,7 @@ import {
 } from 'src/hooks/useGoalCalculatorConstants';
 import { useLocale } from 'src/hooks/useLocale';
 import { percentageFormat } from 'src/lib/intlFormat';
+import { LocationInfoAlert } from '../../Shared/LocationInfoAlert/LocationInfoAlert';
 import { AutosaveTextField } from '../Shared/Autosave/AutosaveTextField';
 import { useSaveField } from '../Shared/Autosave/useSaveField';
 import { usePdsGoalCalculator } from '../Shared/PdsGoalCalculatorContext';
@@ -304,6 +305,7 @@ export const SetupStep: React.FC = () => {
                 />
               )}
             />
+            <LocationInfoAlert />
           </Grid>
         </Grid>
       </Card>
diff --git a/src/components/HrTools/SalaryCalculator/SalaryCalculatorTestWrapper.tsx b/src/components/HrTools/SalaryCalculator/SalaryCalculatorTestWrapper.tsx
index c8e7049c7d..0cbe07f348 100644
--- a/src/components/HrTools/SalaryCalculator/SalaryCalculatorTestWrapper.tsx
+++ b/src/components/HrTools/SalaryCalculator/SalaryCalculatorTestWrapper.tsx
@@ -1,6 +1,7 @@
 import { ThemeProvider } from '@emotion/react';
 import { MockLinkCallHandler } from 'graphql-ergonomock/dist/apollo/MockLink';
 import { merge } from 'lodash';
+import { SnackbarProvider } from 'notistack';
 import { DeepPartial } from 'ts-essentials';
 import TestRouter from '__tests__/util/TestRouter';
 import { GqlMockedProvider, gqlMock } from '__tests__/util/graphqlMocking';
@@ -11,6 +12,7 @@ import {
   UsStaffGroupEnum,
   UserTypeEnum,
 } from 'src/graphql/types.generated';
+import { AccountGeographicLocationQuery } from 'src/hooks/AccountGeographicLocation.generated';
 import { GoalCalculatorConstantsQuery } from 'src/hooks/goalCalculatorConstants.generated';
 import theme from 'src/theme';
 import {
@@ -111,6 +113,7 @@ export interface SalaryCalculatorTestWrapperProps {
   editing?: boolean;
   userType?: UserTypeEnum;
   usStaffGroup?: UsStaffGroupEnum;
+  accountGeographicLocation?: string | null;
 }
 
 export const SalaryCalculatorTestWrapper: React.FC<
@@ -127,85 +130,96 @@ export const SalaryCalculatorTestWrapper: React.FC<
   editing = true,
   userType = UserTypeEnum.UsStaff,
   usStaffGroup = UsStaffGroupEnum.SeniorStaff,
+  accountGeographicLocation = null,
 }) => {
   const hcmUserMerged = merge({}, hcmUserMock, hcmUser);
   const hcmSpouseMerged = merge({}, hcmSpouseMock, hcmSpouse);
   return (
     <ThemeProvider theme={theme}>
-      <TestRouter
-        router={{
-          query: {
-            accountListId: 'account-list-1',
-            calculationId: 'salary-request-1',
-            ...(editing ? {} : { mode: 'view' }),
-          },
-        }}
-      >
-        <GqlMockedProvider<{
-          Hcm: HcmQuery;
-          PayrollDates: PayrollDatesQuery;
-          SalaryCalculation: SalaryCalculationQuery;
-          EffectiveSalaryCalculation: EffectiveSalaryCalculationQuery;
-          GoalCalculatorConstants: GoalCalculatorConstantsQuery;
-          StaffAccount: StaffAccountQuery;
-          GetUser: GetUserQuery;
-        }>
-          mocks={{
-            StaffAccount: {
-              staffAccount: {
-                id: '12345',
-                name: 'Test Account',
-              },
+      <SnackbarProvider>
+        <TestRouter
+          router={{
+            query: {
+              accountListId: 'account-list-1',
+              calculationId: 'salary-request-1',
+              ...(editing ? {} : { mode: 'view' }),
             },
-            GetUser: {
-              user: {
-                userType,
-                usStaffGroup,
+          }}
+        >
+          <GqlMockedProvider<{
+            Hcm: HcmQuery;
+            PayrollDates: PayrollDatesQuery;
+            SalaryCalculation: SalaryCalculationQuery;
+            EffectiveSalaryCalculation: EffectiveSalaryCalculationQuery;
+            GoalCalculatorConstants: GoalCalculatorConstantsQuery;
+            StaffAccount: StaffAccountQuery;
+            GetUser: GetUserQuery;
+            AccountGeographicLocation: AccountGeographicLocationQuery;
+          }>
+            mocks={{
+              StaffAccount: {
+                staffAccount: {
+                  id: '12345',
+                  name: 'Test Account',
+                },
               },
-            },
-            PayrollDates: {
-              payrollDates,
-            },
-            EffectiveSalaryCalculation: {
-              salaryRequest: effectiveSalaryRequestMock,
-            },
-            GoalCalculatorConstants: {
-              constant: {
-                mpdGoalGeographicConstants: [
-                  { location: 'Atlanta, GA' },
-                  { location: 'Miami, FL' },
-                ],
+              GetUser: {
+                user: {
+                  userType,
+                  usStaffGroup,
+                },
               },
-            },
-            Hcm: {
-              hcm: hasSpouse
-                ? [hcmUserMerged, hcmSpouseMerged]
-                : [hcmUserMerged],
-            },
-            SalaryCalculation: {
-              salaryRequest: merge(
-                {
-                  id: 'salary-request-1',
-                  status: SalaryRequestStatusEnum.InProgress,
-                  effectiveDate: '2025-01-01',
-                  calculations: {
-                    hardCap: 80000,
-                    exceptionCap: null,
-                    combinedCap: 125000,
+              AccountGeographicLocation: {
+                accountList: {
+                  settings: {
+                    geographicLocation: accountGeographicLocation,
                   },
-                  progressiveApprovalTier: null,
-                  progressiveApprovalTierReason: null,
-                } satisfies SalaryRequestMock,
-                salaryRequestMock,
-                hasSpouse ? undefined : { spouseCalculations: null },
-              ),
-            },
-          }}
-          onCall={onCall}
-        >
-          <SalaryCalculatorProvider>{children}</SalaryCalculatorProvider>
-        </GqlMockedProvider>
-      </TestRouter>
+                },
+              },
+              PayrollDates: {
+                payrollDates,
+              },
+              EffectiveSalaryCalculation: {
+                salaryRequest: effectiveSalaryRequestMock,
+              },
+              GoalCalculatorConstants: {
+                constant: {
+                  mpdGoalGeographicConstants: [
+                    { location: 'Atlanta, GA' },
+                    { location: 'Miami, FL' },
+                  ],
+                },
+              },
+              Hcm: {
+                hcm: hasSpouse
+                  ? [hcmUserMerged, hcmSpouseMerged]
+                  : [hcmUserMerged],
+              },
+              SalaryCalculation: {
+                salaryRequest: merge(
+                  {
+                    id: 'salary-request-1',
+                    status: SalaryRequestStatusEnum.InProgress,
+                    effectiveDate: '2025-01-01',
+                    calculations: {
+                      hardCap: 80000,
+                      exceptionCap: null,
+                      combinedCap: 125000,
+                    },
+                    progressiveApprovalTier: null,
+                    progressiveApprovalTierReason: null,
+                  } satisfies SalaryRequestMock,
+                  salaryRequestMock,
+                  hasSpouse ? undefined : { spouseCalculations: null },
+                ),
+              },
+            }}
+            onCall={onCall}
+          >
+            <SalaryCalculatorProvider>{children}</SalaryCalculatorProvider>
+          </GqlMockedProvider>
+        </TestRouter>
+      </SnackbarProvider>
     </ThemeProvider>
   );
 };
diff --git a/src/components/HrTools/SalaryCalculator/StepNavigation/StepNavigation.test.tsx b/src/components/HrTools/SalaryCalculator/StepNavigation/StepNavigation.test.tsx
index dac2b41edf..31a390ce16 100644
--- a/src/components/HrTools/SalaryCalculator/StepNavigation/StepNavigation.test.tsx
+++ b/src/components/HrTools/SalaryCalculator/StepNavigation/StepNavigation.test.tsx
@@ -21,6 +21,7 @@ jest.mock('src/components/Shared/Autosave/AutosaveForm', () => {
   };
 });
 
+const location = 'Chicago, IL';
 const mutationSpy = jest.fn();
 
 const TestComponent: React.FC<SalaryCalculatorTestWrapperProps> = (props) => (
@@ -152,4 +153,55 @@ describe('SubmitButton', () => {
       expect(mutationSpy).toHaveGraphqlOperation('SubmitSalaryCalculation'),
     );
   });
+
+  it('updates the account geographic location preference when submitting', async () => {
+    const { findByText } = render(
+      <SalaryCalculatorTestWrapper
+        onCall={mutationSpy}
+        editing={true}
+        salaryRequestMock={{ location }}
+      >
+        <SubmitButton />
+      </SalaryCalculatorTestWrapper>,
+    );
+
+    userEvent.click(await findByText('Submit'));
+    userEvent.click(await findByText('Yes, Continue'));
+
+    await waitFor(() =>
+      expect(mutationSpy).toHaveGraphqlOperation('UpdateAccountPreferences', {
+        input: {
+          id: 'account-list-1',
+          attributes: {
+            id: 'account-list-1',
+            settings: { geographicLocation: location },
+          },
+        },
+      }),
+    );
+  });
+
+  it('does not show geographic location info alert when it matches account preferences', async () => {
+    const { findByRole, queryByText } = render(
+      <SalaryCalculatorTestWrapper
+        onCall={mutationSpy}
+        editing={true}
+        salaryRequestMock={{ location }}
+        accountGeographicLocation={location}
+      >
+        <SubmitButton />
+      </SalaryCalculatorTestWrapper>,
+    );
+
+    userEvent.click(await findByRole('button', { name: 'Submit' }));
+
+    await findByRole('dialog');
+    await waitFor(() =>
+      expect(
+        queryByText(
+          `Your geographic location will be updated as ${location} in your account settings.`,
+        ),
+      ).not.toBeInTheDocument(),
+    );
+  });
 });
diff --git a/src/components/HrTools/SalaryCalculator/StepNavigation/StepNavigation.tsx b/src/components/HrTools/SalaryCalculator/StepNavigation/StepNavigation.tsx
index c6adf6ef41..62d0c49440 100644
--- a/src/components/HrTools/SalaryCalculator/StepNavigation/StepNavigation.tsx
+++ b/src/components/HrTools/SalaryCalculator/StepNavigation/StepNavigation.tsx
@@ -8,6 +8,7 @@ import { useTranslation } from 'react-i18next';
 import { SubmitModal } from 'src/components/HrTools/Shared/CalculationReports/SubmitModal/SubmitModal';
 import { useAutosaveForm } from 'src/components/Shared/Autosave/AutosaveForm';
 import { useAccountListId } from 'src/hooks/useAccountListId';
+import { useApplyGoalAndLocation } from 'src/hooks/useApplyGoalAndLocation';
 import { useSalaryCalculator } from '../SalaryCalculatorContext/SalaryCalculatorContext';
 import { useDeleteSalaryCalculation } from '../Shared/useDeleteSalaryCalculation';
 import { useSubmitSalaryCalculationMutation } from './SubmitSalaryCalculation.generated';
@@ -98,6 +99,12 @@ export const SubmitButton: React.FC<ButtonProps> = (props) => {
   const [submitDialogOpen, setSubmitDialogOpen] = useState(false);
   const { title, content, subContent } = useSubmitDialogContent();
 
+  const {
+    applyMonthlyGoal,
+    geographicLocationChanged,
+    normalizedGeographicLocation,
+  } = useApplyGoalAndLocation(calculation?.location ?? null);
+
   const handleSubmit = async () => {
     if (calculation) {
       await submit({
@@ -108,6 +115,10 @@ export const SubmitButton: React.FC<ButtonProps> = (props) => {
         },
       });
       handleNextStep();
+
+      if (geographicLocationChanged) {
+        applyMonthlyGoal();
+      }
     }
   };
 
@@ -135,6 +146,9 @@ export const SubmitButton: React.FC<ButtonProps> = (props) => {
           overrideContent={content}
           overrideSubContent={subContent}
           submitting={submitting}
+          geographicLocation={
+            geographicLocationChanged ? normalizedGeographicLocation : undefined
+          }
         />
       )}
     </>
diff --git a/src/components/HrTools/Shared/CalculationReports/SubmitModal/SubmitModal.test.tsx b/src/components/HrTools/Shared/CalculationReports/SubmitModal/SubmitModal.test.tsx
index 4f736a4633..070d3a98cc 100644
--- a/src/components/HrTools/Shared/CalculationReports/SubmitModal/SubmitModal.test.tsx
+++ b/src/components/HrTools/Shared/CalculationReports/SubmitModal/SubmitModal.test.tsx
@@ -23,6 +23,7 @@ const title = 'Test Title';
 const content = 'Test Content';
 const subContent = 'Test Sub Content';
 const date = '2024-12-31';
+const location = 'Test Location';
 
 const handleClose = jest.fn();
 const handleConfirm = jest.fn();
@@ -85,6 +86,7 @@ interface TestComponentProps {
   additionalApproval?: boolean;
   splitAsr?: boolean;
   submitting?: boolean;
+  geographicLocation?: string;
 }
 
 const TestComponent: React.FC<TestComponentProps> = ({
@@ -100,6 +102,7 @@ const TestComponent: React.FC<TestComponentProps> = ({
   additionalApproval,
   splitAsr,
   submitting,
+  geographicLocation,
 }) => (
   <ThemeProvider theme={theme}>
     <TestRouter>
@@ -122,6 +125,7 @@ const TestComponent: React.FC<TestComponentProps> = ({
                 additionalApproval={additionalApproval}
                 splitAsr={splitAsr}
                 submitting={submitting}
+                geographicLocation={geographicLocation}
               />
             </MinisterHousingAllowanceProvider>
           </FormikWrapper>
@@ -288,6 +292,29 @@ describe('ConfirmationModal', () => {
     });
   });
 
+  describe('Geographic location info alert', () => {
+    it('shows an info alert naming the geographic location', async () => {
+      const { findByText } = render(
+        <TestComponent geographicLocation={location} />,
+      );
+
+      expect(
+        await findByText(
+          /Your geographic location will be updated to Test Location in your account settings\./i,
+        ),
+      ).toBeInTheDocument();
+    });
+
+    it('does not show info alert when no geographic location is given', async () => {
+      const { findByRole, queryByText } = render(<TestComponent />);
+
+      await findByRole('dialog');
+      expect(
+        queryByText(/Your geographic location will be updated/i),
+      ).not.toBeInTheDocument();
+    });
+  });
+
   describe('submitting state', () => {
     it('shows a loading spinner on the submit button while submitting', async () => {
       const { findByRole } = render(
diff --git a/src/components/HrTools/Shared/CalculationReports/SubmitModal/SubmitModal.tsx b/src/components/HrTools/Shared/CalculationReports/SubmitModal/SubmitModal.tsx
index d1ea607d4d..f0697ac009 100644
--- a/src/components/HrTools/Shared/CalculationReports/SubmitModal/SubmitModal.tsx
+++ b/src/components/HrTools/Shared/CalculationReports/SubmitModal/SubmitModal.tsx
@@ -34,6 +34,7 @@ interface SubmitModalProps {
   splitAsr?: boolean;
   disableSubmit?: boolean;
   submitting?: boolean;
+  geographicLocation?: string;
 }
 
 export const SubmitModal: React.FC<SubmitModalProps> = ({
@@ -52,6 +53,7 @@ export const SubmitModal: React.FC<SubmitModalProps> = ({
   splitAsr,
   disableSubmit,
   submitting,
+  geographicLocation,
 }) => {
   const { t } = useTranslation();
   const locale = useLocale();
@@ -104,6 +106,14 @@ export const SubmitModal: React.FC<SubmitModalProps> = ({
             </Box>
           </Box>
         )}
+        {geographicLocation && (
+          <Alert severity="info" sx={{ mt: 2 }}>
+            {t(
+              'Your geographic location will be updated to {{geographicLocation}} in your account settings.',
+              { geographicLocation },
+            )}
+          </Alert>
+        )}
       </DialogContent>
       <DialogActions>
         <Button
diff --git a/src/components/HrTools/Shared/LocationInfoAlert/LocationInfoAlert.test.tsx b/src/components/HrTools/Shared/LocationInfoAlert/LocationInfoAlert.test.tsx
new file mode 100644
index 0000000000..b42cffa6cc
--- /dev/null
+++ b/src/components/HrTools/Shared/LocationInfoAlert/LocationInfoAlert.test.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import { LocationInfoAlert } from './LocationInfoAlert';
+
+describe('LocationInfoAlert', () => {
+  it('renders the geographic location disclosure', () => {
+    const { getByText } = render(<LocationInfoAlert />);
+
+    expect(
+      getByText(
+        'This will update your geographic location in your account settings.',
+      ),
+    ).toBeInTheDocument();
+  });
+});
diff --git a/src/components/HrTools/Shared/LocationInfoAlert/LocationInfoAlert.tsx b/src/components/HrTools/Shared/LocationInfoAlert/LocationInfoAlert.tsx
new file mode 100644
index 0000000000..08269fbd5c
--- /dev/null
+++ b/src/components/HrTools/Shared/LocationInfoAlert/LocationInfoAlert.tsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import { Alert } from '@mui/material';
+import { useTranslation } from 'react-i18next';
+
+export const LocationInfoAlert: React.FC = () => {
+  const { t } = useTranslation();
+
+  return (
+    <Alert severity="info" sx={{ mt: 1 }}>
+      {t('This will update your geographic location in your account settings.')}
+    </Alert>
+  );
+};
diff --git a/src/components/Settings/preferences/GetAccountPreferences.graphql b/src/components/Settings/preferences/GetAccountPreferences.graphql
index ca9958e4db..3ee0d27d73 100644
--- a/src/components/Settings/preferences/GetAccountPreferences.graphql
+++ b/src/components/Settings/preferences/GetAccountPreferences.graphql
@@ -9,6 +9,7 @@ fragment AccountList on AccountList {
     currency
     homeCountry
     monthlyGoal
+    geographicLocation
     tester
   }
 }
diff --git a/src/components/Settings/preferences/accordions/GeographicLocationAccordion/GeographicLocationAccordion.test.tsx b/src/components/Settings/preferences/accordions/GeographicLocationAccordion/GeographicLocationAccordion.test.tsx
new file mode 100644
index 0000000000..6fc0cdd7a1
--- /dev/null
+++ b/src/components/Settings/preferences/accordions/GeographicLocationAccordion/GeographicLocationAccordion.test.tsx
@@ -0,0 +1,201 @@
+import { MockedProvider, MockedResponse } from '@apollo/client/testing';
+import { ThemeProvider } from '@mui/material/styles';
+import { render, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { SnackbarProvider } from 'notistack';
+import TestRouter from '__tests__/util/TestRouter';
+import { GqlMockedProvider } from '__tests__/util/graphqlMocking';
+import { PreferenceAccordion } from 'src/components/Shared/Forms/Accordions/AccordionEnum';
+import { GoalCalculatorConstantsDocument } from 'src/hooks/goalCalculatorConstants.generated';
+import theme from 'src/theme';
+import { UpdateAccountPreferencesDocument } from '../UpdateAccountPreferences.generated';
+import { GeographicLocationAccordion } from './GeographicLocationAccordion';
+
+const label = 'Geographic Location';
+const accountListId = 'account-list-1';
+const router = {
+  query: { accountListId },
+  isReady: true,
+};
+
+const mockEnqueue = jest.fn();
+jest.mock('notistack', () => ({
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  ...jest.requireActual('notistack'),
+  useSnackbar: () => {
+    return {
+      enqueueSnackbar: mockEnqueue,
+    };
+  },
+}));
+
+const handleAccordionChange = jest.fn();
+const handleSetupChange = jest.fn();
+const mutationSpy = jest.fn();
+
+const geographicConstants = [
+  { location: 'Chicago, IL', percentageMultiplier: 0.1 },
+  { location: 'Los Angeles, CA', percentageMultiplier: 0.15 },
+];
+
+interface ComponentsProps {
+  geographicLocation: string;
+  expandedAccordion: PreferenceAccordion | null;
+}
+
+const Components: React.FC<ComponentsProps> = ({
+  geographicLocation,
+  expandedAccordion,
+}) => (
+  <SnackbarProvider>
+    <TestRouter router={router}>
+      <ThemeProvider theme={theme}>
+        <GqlMockedProvider
+          mocks={{
+            GoalCalculatorConstants: {
+              constant: {
+                mpdGoalGeographicConstants: geographicConstants,
+              },
+            },
+          }}
+          onCall={mutationSpy}
+        >
+          <GeographicLocationAccordion
+            handleAccordionChange={handleAccordionChange}
+            expandedAccordion={expandedAccordion}
+            geographicLocation={geographicLocation}
+            accountListId={accountListId}
+            handleSetupChange={handleSetupChange}
+          />
+        </GqlMockedProvider>
+      </ThemeProvider>
+    </TestRouter>
+  </SnackbarProvider>
+);
+
+const errorMocks: MockedResponse[] = [
+  {
+    request: {
+      query: GoalCalculatorConstantsDocument,
+      variables: { year: null },
+    },
+    result: {
+      data: {
+        constant: {
+          mpdGoalBenefitsConstants: [],
+          mpdGoalGeographicConstants: [],
+          mpdGoalMiscConstants: [],
+        },
+      },
+    },
+  },
+  {
+    request: {
+      query: UpdateAccountPreferencesDocument,
+    },
+    error: { name: 'error', message: 'Error loading data.  Try again.' },
+  },
+];
+
+describe('GeographicLocationAccordion', () => {
+  afterEach(() => {
+    mutationSpy.mockClear();
+  });
+
+  it('should render accordion closed', () => {
+    const { getByText, queryByRole } = render(
+      <Components
+        geographicLocation={'Chicago, IL'}
+        expandedAccordion={null}
+      />,
+    );
+
+    expect(getByText(label)).toBeInTheDocument();
+    expect(queryByRole('combobox')).not.toBeInTheDocument();
+  });
+
+  it('allows saving a blank value', async () => {
+    const value = '';
+
+    const { getByRole } = render(
+      <Components
+        geographicLocation={value}
+        expandedAccordion={PreferenceAccordion.GeographicLocation}
+      />,
+    );
+
+    const button = getByRole('button', { name: 'Save' });
+
+    await waitFor(() => {
+      expect(button).not.toBeDisabled();
+    });
+  });
+
+  it('changes and saves the input', async () => {
+    const { getByRole, getByText } = render(
+      <Components
+        geographicLocation={'Chicago, IL'}
+        expandedAccordion={PreferenceAccordion.GeographicLocation}
+      />,
+    );
+    const button = getByRole('button', { name: 'Save' });
+    const input = getByRole('combobox');
+
+    await waitFor(() => expect(input).toHaveValue('Chicago, IL'));
+
+    userEvent.click(input);
+    userEvent.click(getByText('Los Angeles, CA'));
+    userEvent.click(button);
+
+    await waitFor(() => {
+      expect(mutationSpy.mock.lastCall).toMatchObject([
+        {
+          operation: {
+            operationName: 'UpdateAccountPreferences',
+            variables: {
+              input: {
+                id: accountListId,
+                attributes: {
+                  id: accountListId,
+                  settings: {
+                    geographicLocation: 'Los Angeles, CA',
+                  },
+                },
+              },
+            },
+          },
+        },
+      ]);
+    });
+  });
+
+  it('Should render the error state', async () => {
+    const { getByRole } = render(
+      <SnackbarProvider>
+        <TestRouter router={router}>
+          <ThemeProvider theme={theme}>
+            <MockedProvider mocks={errorMocks}>
+              <GeographicLocationAccordion
+                handleAccordionChange={handleAccordionChange}
+                expandedAccordion={PreferenceAccordion.GeographicLocation}
+                geographicLocation={'Chicago, IL'}
+                accountListId={accountListId}
+                handleSetupChange={handleSetupChange}
+              />
+            </MockedProvider>
+          </ThemeProvider>
+        </TestRouter>
+      </SnackbarProvider>,
+    );
+    const button = getByRole('button', { name: 'Save' });
+
+    userEvent.click(button);
+
+    await waitFor(() => {
+      expect(mockEnqueue).toHaveBeenCalledWith('Saving failed.', {
+        variant: 'error',
+      });
+    });
+  });
+});
diff --git a/src/components/Settings/preferences/accordions/GeographicLocationAccordion/GeographicLocationAccordion.tsx b/src/components/Settings/preferences/accordions/GeographicLocationAccordion/GeographicLocationAccordion.tsx
new file mode 100644
index 0000000000..b577a8d79a
--- /dev/null
+++ b/src/components/Settings/preferences/accordions/GeographicLocationAccordion/GeographicLocationAccordion.tsx
@@ -0,0 +1,136 @@
+import { ReactElement, useMemo } from 'react';
+import { Autocomplete, TextField } from '@mui/material';
+import { Formik } from 'formik';
+import { useSnackbar } from 'notistack';
+import { useTranslation } from 'react-i18next';
+import * as yup from 'yup';
+import { PreferenceAccordion } from 'src/components/Shared/Forms/Accordions/AccordionEnum';
+import { AccordionItem } from 'src/components/Shared/Forms/Accordions/AccordionItem';
+import { FieldWrapper } from 'src/components/Shared/Forms/FieldWrapper';
+import { FormWrapper } from 'src/components/Shared/Forms/FormWrapper';
+import { AccountListSettingsInput } from 'src/graphql/types.generated';
+import { useGoalCalculatorConstants } from 'src/hooks/useGoalCalculatorConstants';
+import { AccordionProps } from '../../../accordionHelper';
+import { useUpdateAccountPreferencesMutation } from '../UpdateAccountPreferences.generated';
+
+const accountPreferencesSchema: yup.ObjectSchema<
+  Pick<AccountListSettingsInput, 'geographicLocation'>
+> = yup.object({
+  geographicLocation: yup.string().nullable(),
+});
+
+interface GeographicLocationAccordionProps
+  extends AccordionProps<PreferenceAccordion> {
+  geographicLocation: string;
+  accountListId: string;
+  disabled?: boolean;
+  handleSetupChange: () => Promise<void>;
+}
+
+export const GeographicLocationAccordion: React.FC<
+  GeographicLocationAccordionProps
+> = ({
+  handleAccordionChange,
+  expandedAccordion,
+  geographicLocation,
+  accountListId,
+  disabled,
+  handleSetupChange,
+}) => {
+  const { t } = useTranslation();
+  const { enqueueSnackbar } = useSnackbar();
+  const [updateAccountPreferences] = useUpdateAccountPreferencesMutation();
+  const label = t('Geographic Location');
+
+  const { goalGeographicConstantMap } = useGoalCalculatorConstants();
+  const locations = useMemo(
+    () => Array.from(goalGeographicConstantMap.keys()),
+    [goalGeographicConstantMap],
+  );
+
+  const onSubmit = async (
+    attributes: Pick<AccountListSettingsInput, 'geographicLocation'>,
+  ) => {
+    await updateAccountPreferences({
+      variables: {
+        input: {
+          id: accountListId,
+          attributes: {
+            id: accountListId,
+            settings: { geographicLocation: attributes.geographicLocation },
+          },
+        },
+      },
+      onCompleted: () => {
+        enqueueSnackbar(t('Saved successfully.'), {
+          variant: 'success',
+        });
+        handleAccordionChange(null);
+      },
+      onError: () => {
+        enqueueSnackbar(t('Saving failed.'), {
+          variant: 'error',
+        });
+      },
+    });
+    handleSetupChange();
+  };
+
+  return (
+    <AccordionItem
+      accordion={PreferenceAccordion.GeographicLocation}
+      onAccordionChange={handleAccordionChange}
+      expandedAccordion={expandedAccordion}
+      label={label}
+      value={geographicLocation}
+      fullWidth
+      disabled={disabled}
+    >
+      <Formik
+        initialValues={{ geographicLocation: geographicLocation }}
+        validationSchema={accountPreferencesSchema}
+        onSubmit={onSubmit}
+        enableReinitialize
+        validateOnMount
+      >
+        {({
+          values: { geographicLocation },
+          handleSubmit,
+          isSubmitting,
+          isValid,
+          setFieldValue,
+        }): ReactElement => (
+          <FormWrapper
+            onSubmit={handleSubmit}
+            isValid={isValid}
+            isSubmitting={isSubmitting}
+          >
+            <FieldWrapper
+              helperText={t(
+                'This should be the major city within 50 miles of you. If none apply, leave this blank.',
+              )}
+            >
+              <Autocomplete
+                options={locations}
+                value={geographicLocation || null}
+                onChange={(_, location) =>
+                  setFieldValue('geographicLocation', location)
+                }
+                disabled={isSubmitting}
+                renderInput={(params) => (
+                  <TextField
+                    {...params}
+                    label={label}
+                    placeholder={label}
+                    sx={{ marginTop: 1 }}
+                    autoFocus
+                  />
+                )}
+              />
+            </FieldWrapper>
+          </FormWrapper>
+        )}
+      </Formik>
+    </AccordionItem>
+  );
+};
diff --git a/src/components/Shared/Forms/Accordions/AccordionEnum.ts b/src/components/Shared/Forms/Accordions/AccordionEnum.ts
index cc006d1dde..f4c83b21b5 100644
--- a/src/components/Shared/Forms/Accordions/AccordionEnum.ts
+++ b/src/components/Shared/Forms/Accordions/AccordionEnum.ts
@@ -34,6 +34,7 @@ export enum PreferenceAccordion {
   DefaultAccount = 'DefaultAccount',
   EarlyAdopter = 'EarlyAdopter',
   ExportAllData = 'ExportAllData',
+  GeographicLocation = 'GeographicLocation',
   HomeCountry = 'HomeCountry',
   HourToSendNotifications = 'HourToSendNotifications',
   Language = 'Language',
diff --git a/src/components/Shared/Modal/Confirmation/Confirmation.tsx b/src/components/Shared/Modal/Confirmation/Confirmation.tsx
index 9db01094f5..9a223ed168 100644
--- a/src/components/Shared/Modal/Confirmation/Confirmation.tsx
+++ b/src/components/Shared/Modal/Confirmation/Confirmation.tsx
@@ -76,7 +76,10 @@ export const Confirmation: React.FC<ConfirmationProps> = ({
               </StyledDialogContentText>
             )}
             {message && (
-              <StyledDialogContentText data-testid="confirmModalMessage">
+              <StyledDialogContentText
+                component="div"
+                data-testid="confirmModalMessage"
+              >
                 {message}
               </StyledDialogContentText>
             )}
diff --git a/src/components/Shared/styledComponents/StyledDialogContentText.ts b/src/components/Shared/styledComponents/StyledDialogContentText.ts
index 97a94a916c..c666129a76 100644
--- a/src/components/Shared/styledComponents/StyledDialogContentText.ts
+++ b/src/components/Shared/styledComponents/StyledDialogContentText.ts
@@ -1,8 +1,8 @@
 import { DialogContentText } from '@mui/material';
 import { styled } from '@mui/material/styles';
 
-export const StyledDialogContentText = styled(DialogContentText)(
-  ({ theme }) => ({
-    color: theme.palette.mpdxGrayDark.main,
-  }),
-);
+export const StyledDialogContentText: typeof DialogContentText = styled(
+  DialogContentText,
+)(({ theme }) => ({
+  color: theme.palette.mpdxGrayDark.main,
+}));
diff --git a/src/hooks/AccountGeographicLocation.graphql b/src/hooks/AccountGeographicLocation.graphql
new file mode 100644
index 0000000000..a89dccffa3
--- /dev/null
+++ b/src/hooks/AccountGeographicLocation.graphql
@@ -0,0 +1,8 @@
+query AccountGeographicLocation($accountListId: ID!) {
+  accountList(id: $accountListId) {
+    id
+    settings {
+      geographicLocation
+    }
+  }
+}
diff --git a/src/hooks/useApplyGoalAndLocation.test.tsx b/src/hooks/useApplyGoalAndLocation.test.tsx
new file mode 100644
index 0000000000..d7e74586e4
--- /dev/null
+++ b/src/hooks/useApplyGoalAndLocation.test.tsx
@@ -0,0 +1,162 @@
+import { ReactElement } from 'react';
+import { waitFor } from '@testing-library/dom';
+import { renderHook } from '@testing-library/react-hooks';
+import { useSnackbar } from 'notistack';
+import TestRouter from '__tests__/util/TestRouter';
+import { GqlMockedProvider } from '__tests__/util/graphqlMocking';
+import { AccountGeographicLocationQuery } from './AccountGeographicLocation.generated';
+import { useApplyGoalAndLocation } from './useApplyGoalAndLocation';
+
+jest.mock('notistack');
+
+const mockUseSnackbar = useSnackbar as jest.Mock;
+const enqueueSnackbar = jest.fn();
+const mutationSpy = jest.fn();
+
+interface TestWrapperProps {
+  children: ReactElement;
+  accountGeographicLocation?: string | null;
+}
+
+const TestWrapper = ({
+  children,
+  accountGeographicLocation = null,
+}: TestWrapperProps) => (
+  <TestRouter router={{ query: { accountListId: 'account-list-1' } }}>
+    <GqlMockedProvider<{
+      AccountGeographicLocation: AccountGeographicLocationQuery;
+    }>
+      mocks={{
+        AccountGeographicLocation: {
+          accountList: {
+            settings: { geographicLocation: accountGeographicLocation },
+          },
+        },
+      }}
+      onCall={mutationSpy}
+    >
+      {children}
+    </GqlMockedProvider>
+  </TestRouter>
+);
+
+const renderApplyGoalAndLocation = (
+  geographicLocation: string | null,
+  accountGeographicLocation: string | null = null,
+) =>
+  renderHook(() => useApplyGoalAndLocation(geographicLocation), {
+    wrapper: ({ children }: TestWrapperProps) => (
+      <TestWrapper accountGeographicLocation={accountGeographicLocation}>
+        {children}
+      </TestWrapper>
+    ),
+  });
+
+describe('useApplyGoalAndLocation', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseSnackbar.mockReturnValue({ enqueueSnackbar });
+  });
+
+  it('writes the new location and names it when the location changed', async () => {
+    const { result } = renderApplyGoalAndLocation('Miami, FL', null);
+
+    await waitFor(() =>
+      expect(mutationSpy).toHaveGraphqlOperation('AccountGeographicLocation'),
+    );
+    expect(result.current.geographicLocationChanged).toBe(true);
+    expect(result.current.normalizedGeographicLocation).toBe('Miami, FL');
+
+    result.current.applyMonthlyGoal(16139);
+
+    await waitFor(() =>
+      expect(mutationSpy).toHaveGraphqlOperation('UpdateAccountPreferences', {
+        input: {
+          id: 'account-list-1',
+          attributes: {
+            id: 'account-list-1',
+            settings: { monthlyGoal: 16139, geographicLocation: 'Miami, FL' },
+          },
+        },
+      }),
+    );
+
+    expect(enqueueSnackbar).toHaveBeenCalledWith(
+      'Successfully updated your monthly goal to $16,139 and geographic location to Miami, FL!',
+      { variant: 'success' },
+    );
+  });
+
+  it('does not mention location in the snackbar when it is unchanged', async () => {
+    const { result } = renderApplyGoalAndLocation('Miami, FL', 'Miami, FL');
+
+    await waitFor(() =>
+      expect(mutationSpy).toHaveGraphqlOperation('AccountGeographicLocation'),
+    );
+    expect(result.current.geographicLocationChanged).toBe(false);
+
+    result.current.applyMonthlyGoal(16139);
+
+    await waitFor(() =>
+      expect(mutationSpy).toHaveGraphqlOperation('UpdateAccountPreferences'),
+    );
+
+    expect(enqueueSnackbar).toHaveBeenCalledWith(
+      'Successfully updated your monthly goal to $16,139!',
+      { variant: 'success' },
+    );
+  });
+
+  it('normalizes a null location to None when the saved location is set', async () => {
+    const { result } = renderApplyGoalAndLocation(null, 'Miami, FL');
+
+    await waitFor(() =>
+      expect(mutationSpy).toHaveGraphqlOperation('AccountGeographicLocation'),
+    );
+    expect(result.current.geographicLocationChanged).toBe(true);
+    expect(result.current.normalizedGeographicLocation).toBe('None');
+
+    result.current.applyMonthlyGoal(16139);
+
+    await waitFor(() =>
+      expect(mutationSpy).toHaveGraphqlOperation('UpdateAccountPreferences', {
+        input: {
+          id: 'account-list-1',
+          attributes: {
+            id: 'account-list-1',
+            settings: { monthlyGoal: 16139, geographicLocation: 'None' },
+          },
+        },
+      }),
+    );
+
+    expect(enqueueSnackbar).toHaveBeenCalledWith(
+      'Successfully updated your monthly goal to $16,139 and geographic location to None!',
+      { variant: 'success' },
+    );
+  });
+
+  it('writes only the location and shows no snackbar when no monthlyGoal is given', async () => {
+    const { result } = renderApplyGoalAndLocation('Miami, FL', null);
+
+    await waitFor(() =>
+      expect(mutationSpy).toHaveGraphqlOperation('AccountGeographicLocation'),
+    );
+
+    result.current.applyMonthlyGoal();
+
+    await waitFor(() =>
+      expect(mutationSpy).toHaveGraphqlOperation('UpdateAccountPreferences', {
+        input: {
+          id: 'account-list-1',
+          attributes: {
+            id: 'account-list-1',
+            settings: { geographicLocation: 'Miami, FL' },
+          },
+        },
+      }),
+    );
+
+    expect(enqueueSnackbar).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/hooks/useApplyGoalAndLocation.ts b/src/hooks/useApplyGoalAndLocation.ts
new file mode 100644
index 0000000000..f008e23c60
--- /dev/null
+++ b/src/hooks/useApplyGoalAndLocation.ts
@@ -0,0 +1,85 @@
+import { useSnackbar } from 'notistack';
+import { useTranslation } from 'react-i18next';
+import { useUpdateAccountPreferencesMutation } from 'src/components/Settings/preferences/accordions/UpdateAccountPreferences.generated';
+import { currencyFormat } from 'src/lib/intlFormat';
+import { useAccountGeographicLocationQuery } from './AccountGeographicLocation.generated';
+import { useAccountListId } from './useAccountListId';
+import { GEOGRAPHIC_LOCATION_NONE } from './useGoalCalculatorConstants';
+import { useLocale } from './useLocale';
+
+interface ApplyGoalAndLocationOptions {
+  refetchQueries?: string[];
+}
+
+export const useApplyGoalAndLocation = (geographicLocation: string | null) => {
+  const { t } = useTranslation();
+  const locale = useLocale();
+  const { enqueueSnackbar } = useSnackbar();
+  const accountListId = useAccountListId();
+  const { data } = useAccountGeographicLocationQuery({
+    variables: { accountListId },
+  });
+  const [updateAccountPreferences, { loading }] =
+    useUpdateAccountPreferencesMutation();
+
+  // The location dropdowns will always default to "None" if the location is null, so we can treat null as "None" for comparison purposes.
+  const normalizedGeographicLocation =
+    geographicLocation ?? GEOGRAPHIC_LOCATION_NONE;
+  const savedGeographicLocation =
+    data?.accountList?.settings?.geographicLocation ?? GEOGRAPHIC_LOCATION_NONE;
+  const geographicLocationChanged =
+    savedGeographicLocation !== normalizedGeographicLocation;
+
+  const applyMonthlyGoal = (
+    monthlyGoal?: number,
+    options?: ApplyGoalAndLocationOptions,
+  ) => {
+    return updateAccountPreferences({
+      variables: {
+        input: {
+          id: accountListId,
+          attributes: {
+            id: accountListId,
+            settings: {
+              ...(monthlyGoal !== undefined && { monthlyGoal }),
+              geographicLocation: normalizedGeographicLocation,
+            },
+          },
+        },
+      },
+      refetchQueries: options?.refetchQueries,
+      onCompleted: () => {
+        // Salary and NSO questionnaire does not require a monthly goal, so
+        // don't show a success message if undefined. The callers can handle
+        // showing a success message if needed.
+        if (monthlyGoal === undefined) {
+          return;
+        }
+
+        const formattedTotal = currencyFormat(monthlyGoal, 'USD', locale);
+        enqueueSnackbar(
+          !geographicLocationChanged
+            ? t(
+                'Successfully updated your monthly goal to {{formattedTotal}}!',
+                { formattedTotal },
+              )
+            : t(
+                'Successfully updated your monthly goal to {{formattedTotal}} and geographic location to {{geographicLocation}}!',
+                {
+                  formattedTotal,
+                  geographicLocation: normalizedGeographicLocation,
+                },
+              ),
+          { variant: 'success' },
+        );
+      },
+    });
+  };
+
+  return {
+    applyMonthlyGoal,
+    geographicLocationChanged,
+    normalizedGeographicLocation,
+    loading,
+  };
+};