diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 238f63aa6..30c47e578 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -51,23 +51,17 @@ export default {
             type: Function,
         },
     },
-    data() {
-        return {
-            modal: null,
-        };
-    },
-    mounted() {
-        this.modal = new Modal(document.getElementById(this.modalId));
-    },
     methods: {
         resetButtonStyle() {
             this.$refs.buttonMain.resetButtonStyle();
         },
         openModal() {
-            this.modal.show();
+            const modal = Modal.getOrCreateInstance(document.getElementById(this.modalId));
+            modal.show();
         },
         closeModal() {
-            this.modal.hide();
+            const modal = Modal.getInstance(document.getElementById(this.modalId));
+            modal.hide();
         },
     },
     components: {
diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index ac963ca0f..bbbbb0bd7 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -1,6 +1,7 @@
 <template>
     <div class="textbox-question" :class="(errors && errors.length) || hasError ? 'has-error' : ''">
-        <label v-if="displayQuestionText"
+        <label
+            v-if="displayQuestionText"
             :for="inputId"
             :aria-label="questionText"
             class="form-label"
@@ -55,7 +56,7 @@ export default {
         },
         displayQuestionText: {
             type: Boolean,
-            default: true
+            default: true,
         },
         modelValue: String,
         inputId: String,
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 1f8c4d990..7afae044e 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
@@ -83,7 +83,6 @@
             alertClass="alert-warning"
             v-bind:isDismissible="false" />
     </div>
-
 </template>
 
 <script>
@@ -432,7 +431,6 @@ export default {
 </script>
 
 <style lang="scss">
-
 .address-questions {
     margin-top: 0.5rem;
 }
@@ -445,5 +443,4 @@ export default {
         left: 0 !important;
     }
 }
-
 </style>
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 6102373aa..dbce77065 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
@@ -30,9 +30,9 @@
             v-model="mobileLocationQuestionModel.addressQuestions"
             captureApartmentNumberOrBusinessName="true" />
         <vehicleProtectedQuestion
-            ref="vehicleProtectedQuestion" 
+            ref="vehicleProtectedQuestion"
             v-model="mobileLocationQuestionModel.isVehicleProtected"
-            cmsWidgetName="VehicleProtectedQuestionWidget"  />
+            cmsWidgetName="VehicleProtectedQuestionWidget" />
         <textBlock cmsWidgetName="WorkspaceRequirementsWidget" typeStyle="caption" />
     </modal>
 </template>
@@ -55,7 +55,6 @@ import baseMixin from "@/mixins/base-mixin.js";
 
 // Define Validation Rules
 
-
 export default {
     name: "mobile-location-modal-questions",
     emits: ["update:modelValue"], // The component emits an event
@@ -68,9 +67,9 @@ export default {
         const modalForm = useForm();
 
         return {
-            modalForm, 
-        }
-    },    
+            modalForm,
+        };
+    },
     props: {
         modelValue: {
             type: Object,
@@ -100,7 +99,7 @@ export default {
         },
         mobileLocationLinkText() {
             return this.getCmsContent(this.cmsWidgetName, "BodyText");
-        },        
+        },
         getModalId() {
             return "#" + this.modalWidgetName;
         },
@@ -139,7 +138,6 @@ export default {
             } else {
                 this.$refs.mobileLocationModal.resetButtonStyle();
             }
-                   
         },
     },
 
@@ -169,5 +167,4 @@ export default {
 .address-questions {
     margin-top: 0em;
 }
-
 </style>
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 45b80caa6..3f7636fd1 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
@@ -10,8 +10,6 @@
         isRequired />
 </template>
 
-
-
 <script>
 import buttonQuestion from "@/digital-components/button-question/button-question";
 // Supporting files
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 6206ddb14..f3627d362 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -36,8 +36,6 @@ import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-heade
 import { Form } from "vee-validate";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
-import { validator } from "vee-validate"
-import { provide } from 'vue';
 
 export default {
     name: "service-location",
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 00a892405..262d6e769 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -85,6 +85,13 @@ export default {
         alertNonServiceableZipWidgetName: String,
         alertInvalidZipWidgetName: String,
     },
+    setup() {
+        const modalForm = useForm();
+
+        return {
+            modalForm,
+        };
+    },
     methods: {
         openZipCodeModal() {
             this.$refs[this.modalName].openModal();
@@ -122,25 +129,21 @@ export default {
 
         async setZip() {
             this.resetAlerts();
+            const componentValidation = await this.modalForm.validate();
+            if (componentValidation.valid) {
+                const zipCodeData = await this.getZipCodeData(this.serviceZipCodeInput);
+                if (!zipCodeData.isValid) {
+                    this.displayInvalidZipAlert = true;
+                } else if (!zipCodeData.isServiceable) {
+                    this.displayNonServiceableZipAlert = true;
+                } else {
+                    this.serviceZip = this.serviceZipCodeInput;
+                    this.serviceZipState = zipCodeData.state;
 
-            const zipLength = 5;
-            if (!this.serviceZipCodeInput || this.serviceZipCodeInput.length < zipLength) {
-                // prevent reading 1111 as 01111
-                return;
-            }
+                    this.$refs[this.modalName].closeModal();
+                }
+            } 
 
-            const zipCodeData = await this.getZipCodeData(this.serviceZipCodeInput);
-
-            if (!zipCodeData.isValid) {
-                this.displayInvalidZipAlert = true;
-            } else if (!zipCodeData.isServiceable) {
-                this.displayNonServiceableZipAlert = true;
-            } else {
-                this.serviceZip = this.serviceZipCodeInput;
-                this.serviceZipState = zipCodeData.state;
-
-                this.$refs[this.modalName].closeModal();
-            }
         },
     },
     computed: {
@@ -203,5 +206,4 @@ export default {
     vertical-align: middle;
     margin-right: 0.5em;
 }
-
 </style>