diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index c37e596ef..1769961b7 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -22,6 +22,7 @@
                 aria-live="polite">
                 <div class="col">
                     <textboxQuestion
+                        customInputId="apartmentNumberOrBusinessName"
                         cmsWidgetName="ApartmentNumberOrBusinessNameQuestionWidget"
                         v-model="addressModel.apartmentNumberOrBusinessName"
                         ref="apartmentNumberOrBusinessName" />
@@ -32,6 +33,7 @@
             <div class="row mb-4" v-show="showAddressFields" aria-live="polite">
                 <div class="col">
                     <textboxQuestion
+                        customInputId="city"
                         cmsWidgetName="CityQuestionWidget"
                         v-model="addressModel.city"
                         ref="city"
@@ -43,14 +45,17 @@
             <div class="row mb-4" v-show="showAddressFields" aria-live="polite">
                 <div class="col">
                     <dropdownQuestion
+                        customInputId="state"
                         cmsWidgetName="StateQuestionWidget"
                         v-model="addressModel.state"
                         ref="state"
                         :options="stateOptions"
+                        initialValue="FL"
                         validationRules="state-required" />
                 </div>
                 <div class="col">
                     <textboxQuestion
+                        customInputId="zipCode"
                         cmsWidgetName="ZipQuestionWidget"
                         v-model="addressModel.zipCode"
                         ref="zipCode"
diff --git a/src/helpers/object-cloning-helper.js b/src/layouts/service-location/helpers/object-cloning-helper/object-cloning-helper.js
similarity index 100%
rename from src/helpers/object-cloning-helper.js
rename to src/layouts/service-location/helpers/object-cloning-helper/object-cloning-helper.js
diff --git a/src/helpers/object-cloning-helper.spec.js b/src/layouts/service-location/helpers/object-cloning-helper/object-cloning-helper.spec.js
similarity index 100%
rename from src/helpers/object-cloning-helper.spec.js
rename to src/layouts/service-location/helpers/object-cloning-helper/object-cloning-helper.spec.js
diff --git a/src/helpers/service-location-helper.js b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
similarity index 69%
rename from src/helpers/service-location-helper.js
rename to src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
index 5d3a1c603..a1aeb4b7b 100644
--- a/src/helpers/service-location-helper.js
+++ b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
@@ -1,17 +1,21 @@
 import { storeActions } from "@/constants/store-actions";
 import baseMixin from "@/mixins/base-mixin.js";
 
-export async function getPricedMobileFeePart(serviceZipCode) {
-    if (!serviceZipCode) {
+export async function getPricedMobileFeePart(serviceZipCode, serviceType, parentAccountNumber, billToAccountNumber) {
+    if (!serviceZipCode || !serviceType || !parentAccountNumber) {
         return Promise.resolve(null);
     }
 
     const zipCodeData = await baseMixin.methods.getZipCodeData(serviceZipCode);
- 
+
     // Get the Mobile Fee Part
     const mobileFeePart = await baseMixin.methods.dispatchStoreAction(
         storeActions.GET_MOBILE_FEE_PART,
-        null,
+        {
+            serviceType: serviceType,
+            parentAccountNumber: parentAccountNumber,
+            billToAccountNumber: billToAccountNumber
+        },
         false
     );
 
diff --git a/src/helpers/service-location-helper.spec.js b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.spec.js
similarity index 100%
rename from src/helpers/service-location-helper.spec.js
rename to src/layouts/service-location/helpers/service-location-helper/service-location-helper.spec.js
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index f5fcf4574..5063dc432 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -58,8 +58,7 @@ import addressQuestions from "@/layouts/address-lookup/customer-questions/addres
 import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question";
 
 // Helpers
-import { deepClone } from "@/helpers/object-cloning-helper";
-import { object } from "yup/lib/locale";
+import { deepClone } from "@/layouts/service-location/helpers/object-cloning-helper/object-cloning-helper";
 
 export default {
     name: "mobile-location-modal-questions",
@@ -128,7 +127,7 @@ export default {
             if (!this.mobileFeePart) {
                 return 0;
             }
-            
+
             return (
                 this.mobileFeePart.laborAmount +
                 this.mobileFeePart.sellingPrice +
@@ -152,23 +151,19 @@ export default {
         closeModal() {
             this.$refs[this.modalName].closeModal();
         },
-        resetComponent() {
-            this.resetModel();
-
-            // Reset the validation form
-            this.$refs[this.modalName].form.resetForm();
-
-            // Reinitialize the Address Auto Complete
-            this.$refs.addressQuestions.setupAddressLookup();
+        resetComponent(updatedServiceZipCodeInfo) {
+            // Reset the validation form, setting the initial values
+            // for the state and zipCode to those that were entered
+            // on the service-zip-modal-question component
+            this.$refs[this.modalName].form.resetForm({
+                values: {
+                    state: updatedServiceZipCodeInfo.state,
+                    zipCode: updatedServiceZipCodeInfo.zipCode,
+                },
+            });
         },
-        resetModel() {
-            // Address
-            this.internalModel.addressQuestions.streetAddress = "";
-            this.internalModel.addressQuestions.apartmentNumberOrBusinessName = "";
-            this.internalModel.addressQuestions.city = "";
-
-            // Is Vehicle Protected
-            this.internalModel.isVehicleProtected = null;
+        onAddressUpdated(updatedServiceZipCodeInfo) {
+            this.resetComponent(updatedServiceZipCodeInfo);
         },
         async setMobileLocation() {
             // Validate the Zip Code
@@ -189,6 +184,11 @@ export default {
         modelValue: {
             handler(newValue) {
                 this.internalModel = deepClone(newValue);
+
+                this.resetComponent({
+                    state: newValue.state,
+                    zipCode: newValue.zipCode
+                })
             },
             deep: true,
         },
diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index fb92fbf58..b163f7592 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -32,7 +32,7 @@ const mockGetPricedMobileFeePart = (mockServiceZipCode) => {
     return Promise.resolve(mobileFeePart);
 };
 
-jest.mock("@/helpers/service-location-helper", () => ({
+jest.mock("@/layouts/service-location/helpers/service-location-helper/service-location-helper", () => ({
     getPricedMobileFeePart: jest.fn((mockServiceZipCode) => {
         return mockGetPricedMobileFeePart(mockServiceZipCode);
     }),
@@ -107,6 +107,9 @@ const mockMixin = {
         getTotalLineItemPrice: jest.fn((lineItem) => {
             return 49.99;
         }),
+
+        onSubmit: jest.fn(),
+        onInvalidSubmit: jest.fn(),
     },
 };
 
@@ -130,6 +133,9 @@ beforeEach(() => {
                 state: "OH",
             },
         },
+        damage: {
+            isRepair: false
+        },
         payment: {
             isInsurance: false,
         },
@@ -168,7 +174,7 @@ describe("service-location.vue", () => {
             );
 
             // Assert
-            expect(wrapper.vm.mobileLocationQuestions.mobileFeePart).toStrictEqual(mobileFeePart);
+            expect(wrapper.vm.mobileFeePart).toStrictEqual(mobileFeePart);
         });
     });
 
@@ -217,7 +223,9 @@ describe("service-location.vue", () => {
     describe("updating service zip", () => {
         test("updates the page model after providing the service zip code", () => {
             // Arrange
-            const { wrapper } = setupMocks({});
+            const { wrapper } = setupMocks({
+                mixins: [mockMixin]
+            });
             wrapper.vm.$refs.mobileLocationModalQuestions.resetComponent = jest.fn();
 
             const newServiceZipCodeQuestion = {
@@ -256,7 +264,6 @@ describe("service-location.vue", () => {
                     zipCode: "43054",
                 },
                 isVehicleProtected: true,
-                mobileFeePart: null,
             };
             wrapper.vm.mobileLocationQuestions = mobileLocationQuestions;
 
@@ -269,7 +276,6 @@ describe("service-location.vue", () => {
                     zipCode: "61606",
                 },
                 isVehicleProtected: null,
-                mobileFeePart: null,
             };
 
             const serviceZipCodeComponent = wrapper.findComponent({
@@ -299,7 +305,6 @@ describe("service-location.vue", () => {
                     zipCode: "",
                 },
                 isVehicleProtected: null,
-                mobileFeePart: null,
             };
             wrapper.vm.mobileLocationQuestions = mobileLocationQuestions;
 
@@ -312,7 +317,6 @@ describe("service-location.vue", () => {
                     zipCode: "43054",
                 },
                 isVehicleProtected: true,
-                mobileFeePart: null,
             };
 
             const mobileLocationComponent = wrapper.findComponent({
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 3d1ea1a61..00017db80 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -37,7 +37,7 @@ import { Form } from "vee-validate";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
-import { getPricedMobileFeePart } from "@/helpers/service-location-helper";
+import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
 import store from "@/store";
 
 export default {
@@ -49,6 +49,7 @@ export default {
             city: this.getServiceCityFromStore(),
             state: this.getServiceStateFromStore(),
             zipCode: this.getServiceZipCodeFromStore(),
+            isVehicleProtected: null,
             isZipServiceableMobile: null,
             isZipServiceableInShop: null,
             mobileFeePart: null,
@@ -59,7 +60,11 @@ export default {
         const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
         const serviceZipCode = store.getters.order.serviceLocation.zipCode;
-        const mobileFeePartPromise = getPricedMobileFeePart(serviceZipCode);
+        const serviceType = store.getters.damage.isRepair ? "Repair" : "Replace";
+        const parentAccountNumber = store.getters.payment.parentAccountNumber;
+        const billToAccountNumber = 0;
+
+        const mobileFeePartPromise = getPricedMobileFeePart(serviceZipCode, serviceType, parentAccountNumber, billToAccountNumber);
 
         // Settle promises and get results
         const promiseResultMap = [
@@ -91,7 +96,7 @@ export default {
             },
             set: function (newValue) {
                 if (newValue.zipCode !== this.zipCode) {
-                    this.resetMobileLocation(newValue.zipCode);
+                    this.resetMobileLocation(newValue);
                 }
 
                 this.state = newValue.state;
@@ -124,12 +129,11 @@ export default {
     },
     methods: {
         arePagePrerequisitesValid() {
-            return true;
-            // return (
-            //     store.getters.lineItems.supportingItems !== null &&
-            //     store.getters.order.serviceLocation.zipCode !== null &&
-            //     store.getters.payment.isInsurance !== null
-            // );
+            return (
+                store.getters.lineItems.supportingItems !== null &&
+                store.getters.order.serviceLocation.zipCode !== null &&
+                store.getters.payment.isInsurance !== null
+            );
         },
         setData(mobileFeePart) {
             if (mobileFeePart) {
@@ -149,19 +153,22 @@ export default {
             return store.getters.order.serviceLocation.zipCode;
         },
         resetMobileFeePart(serviceZipCode) {
-            getPricedMobileFeePart(serviceZipCode).then((pricedMobileFeePart) => {
+            const serviceType = store.getters.damage.isRepair ? "Repair" : "Replace";
+            const parentAccountNumber = store.getters.payment.parentAccountNumber;
+            const billToAccountNumber = 0;
+
+            getPricedMobileFeePart(serviceZipCode, serviceType, parentAccountNumber, billToAccountNumber).then((pricedMobileFeePart) => {
                 this.mobileFeePart = pricedMobileFeePart;
             });
         },
-        resetMobileLocation(updatedServiceZipCode) {
+        resetMobileLocation(updatedServiceZipCodeInfo) {
             this.streetAddress = "";
             this.apartmentNumberOrBusinessName = "";
             this.city = "";
+
             this.isVehicleProtected = null;
 
-            this.$refs.mobileLocationModalQuestions.resetComponent();
-
-            this.resetMobileFeePart(updatedServiceZipCode);
+            this.resetMobileFeePart(updatedServiceZipCodeInfo.zipCode);
         },
         backButtonAction() {
             this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);