diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 105b8cdc1..64bf3d5f4 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -12,17 +12,17 @@
                     @set-mobile-fee-part="setMobileFeePart"
                     linkWidgetName="ServiceZipLinkWidget"
                     modalWidgetName="ServiceZipModalWidget" />
+                <alert
+                    class="my-4"
+                    cmsWidgetName="AlertMilitaryBaseZipWidget"
+                    v-if="zipContainsMilitaryBase"
+                    alertClass="alert-warning" />    
                 <serviceTypeQuestion
                     v-model="selectedServiceType"
                     ref="serviceTypeQuestion"
                     groupName="ServiceTypeQuestion"
                     cmsWidgetName="ServiceTypeQuestionWidget"
                     validationRules="option-required" />
-                <alert
-                    class="my-4"
-                    cmsWidgetName="AlertMilitaryBaseZipWidget"
-                    v-if="zipContainsMilitaryBase"
-                    alertClass="alert-warning" />
                 <mobileLocationModalQuestions
                     v-if="selectedServiceType === 'Mobile'"
                     v-model="mobileLocationQuestions"
@@ -87,6 +87,7 @@ export default {
         const serviceType = store.getters.damage.isRepair ? "Repair" : "Replace";
         const parentAccountNumber = store.getters.payment.parentAccountNumber;
         const billToAccountNumber = 1;
+        const getZipCodeData = baseMixin.methods.getZipCodeData(serviceZipCode);
 
         const mobileFeePartPromise = getPricedMobileFeePart(
             serviceZipCode,
@@ -107,7 +108,7 @@ export default {
             },
             {
                 resultKey: "zipCodeData",
-                promise: baseMixin.methods.getZipCodeData(serviceZipCode),
+                promise: getZipCodeData,
             },
         ];
 
@@ -117,8 +118,6 @@ export default {
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
             vm.setData(resultMap.mobileFeePart);
-            vm.zipContainsMilitaryBase = resultMap.zipCodeData.containsMilitaryBase;
-            vm.zipCode = serviceZipCode;
         });
     },
     computed: {
@@ -167,17 +166,20 @@ 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) {
+        setData(zipCodeData, mobileFeePart) {
             if (mobileFeePart) {
                 this.mobileFeePart = mobileFeePart;
             }
+
+            if (zipCodeData) {
+                this.zipContainsMilitaryBase = zipCodeData.containsMilitaryBase;
+            }
         },
         getServiceAddressFromStore() {
             return store.getters.order.serviceLocation.address;