diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 32a00ad15..ba7e60eb6 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -29,7 +29,7 @@
                     <modalButtonMain
                         isPrimary
                         class="w-100"
-                        ref="buttonMain"
+                        ref="modalButtonMain"
                         loaderColor="white"
                         :buttonText="footerButtonText"
                         @click-event="validateAndEmit"
@@ -79,7 +79,7 @@ export default {
             }
         },
         resetButtonStyle() {
-            this.$refs.buttonMain.resetButtonStyle();
+            this.$refs.modalButtonMain.resetButtonStyle();
         },
         onModalOpened() {
             this.onModalOpenedCallback?.();
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 d0128bcd3..bbed9923d 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
@@ -161,6 +161,7 @@ export default {
         },
         onModalClosed() {
             this.internalModel = deepClone(this.modelValue);
+            this.resetAlerts();
         },
         resetComponent(updatedServiceZipCodeInfo) {
             // Reset the validation form, setting the initial values
@@ -179,6 +180,9 @@ export default {
         resetModalButtonStyle() {
             this.$refs[this.modalName].resetButtonStyle();
         },
+        resetAlerts() {
+            this.$refs.addressQuestions.displayVerificationWarning = false;
+        },
         async setMobileLocation() {
             // Validate the Zip Code
             const zipCodeData = await this.getZipCodeData(
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index e6613cda8..d8167ad57 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -29,7 +29,7 @@
                 cmsWidgetName="ServiceTypeQuestionWidget"
                 validationRules="option-required" />
             <mobileLocationModalQuestions
-                v-if="selectedServiceType === 'Mobile'"
+                v-show="selectedServiceType === 'Mobile'"
                 v-model="mobileLocationQuestions"
                 :mobileFeePart="mobileFeePart"
                 @updated-mobile-fee-part="setMobileFeePart"
@@ -39,7 +39,7 @@
                 linkWidgetName="MobileLocationLinkWidget"
                 modalWidgetName="MobileLocationModalWidget" />
             <textboxQuestion
-                v-if="selectedServiceType === 'Mobile'"
+                v-show="selectedServiceType === 'Mobile'"
                 ref="mobileLocationQuestionsError"
                 v-model="mobileLocationValidationField"
                 validationRules="mobile-location-required"