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 bde24ed09..f50d855f7 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
@@ -235,13 +235,12 @@ export default {
             this.displayMismatchStateAndZipAlert = false;
         },
         async setMobileLocation() {
-            this.resetAlerts();
-            this.setMobileLocationInvalid(true);
             // Validate the Zip Code
             if (
                 this.internalModel.addressQuestions.zipCode === "" ||
                 this.internalModel.addressQuestions.zipCode.length !== 5
             ) {
+                this.setMobileLocationInvalid(true);
                 return;
             }
             const zipCodeData = await this.getZipCodeData(
@@ -250,15 +249,22 @@ export default {
             );
 
             if (!zipCodeData.isValid) {
+                this.displayMismatchStateAndZipAlert = false;
                 this.displayInvalidZipAlert = true;
+                this.setMobileLocationInvalid(true);
                 return;
             } else if (zipCodeData.state != this.internalModel.addressQuestions.state) {
+                this.displayInvalidZipAlert = false;
                 this.displayMismatchStateAndZipAlert = true;
+                this.setMobileLocationInvalid(true);
                 return;
             } else if (
                 this.internalModel.addressQuestions.zipCode !==
                 this.modelValue.addressQuestions.zipCode
             ) {
+                //reset alerts
+                this.resetAlerts();
+
                 // retrieve mobile fee part
                 const serviceZipCode = this.internalModel.addressQuestions.zipCode;
                 const mobileFeePart = await getPricedMobileFeePart(
diff --git a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
index ce0f7ed53..b13f72ca9 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
@@ -57,7 +57,7 @@ export default {
 </script>
 
 <style lang="scss">
-.modal-dialog {
+.mobile-location-questions {
     .question-text {
         & > span {
             text-align: left;