diff --git a/src/common-components/site-footer/site-footer.vue b/src/common-components/site-footer/site-footer.vue
index 9cfdf83d..966ea45c 100644
--- a/src/common-components/site-footer/site-footer.vue
+++ b/src/common-components/site-footer/site-footer.vue
@@ -12,7 +12,7 @@
                     isPrimary
                     :buttonText="buttonText"
                     loaderColor="white"
-                    :class="isForwardActionDisabled && 'form-test-invalid'"
+                    :class="(disableForwardAction || isForwardActionDisabled) && 'form-test-invalid'"
                     :aria-disabled="isForwardActionDisabled"
                     :isDisabled="isForwardActionDisabled"
                     @click-event="buttonClick"
@@ -55,6 +55,7 @@ export default {
         return {
             paddingHeight: 0,
             customButtontext: "",
+            disableForwardAction: false,
         };
     },
     mounted() {
@@ -111,6 +112,12 @@ export default {
         linkClick() {
             this.$emit("backClicked");
         },
+        disableForwardButton() {
+            this.disableForwardAction = true;
+        },
+        enableForwardAction() {
+            this.disableForwardAction = false;
+        }
     },
 };
 </script>
diff --git a/src/layouts/address-lookup/address-lookup.spec.js b/src/layouts/address-lookup/address-lookup.spec.js
index 161ce9a5..ebc75059 100644
--- a/src/layouts/address-lookup/address-lookup.spec.js
+++ b/src/layouts/address-lookup/address-lookup.spec.js
@@ -668,6 +668,8 @@ function setupMocks({
     wrapper.vm.setCmsContent = jest.fn();
     wrapper.vm.$refs.siteFooter.updateButtonText = jest.fn();
     wrapper.vm.$refs.siteFooter.removeLoader = jest.fn();
+    wrapper.vm.$refs.siteFooter.disableForwardButton = jest.fn();
+    wrapper.vm.$refs.siteFooter.enableForwardAction = jest.fn();
 
     return { wrapper };
 }
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index 1da8fc84..b88c10c6 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -12,7 +12,7 @@
                 ref="vehicleBanner"
                 :displayGenericVehicleImage="false" />
             <siteSubHeader cmsWidgetName="SiteSubHeaderWidget" ref="siteSubHeader" />
-            <div class="fade-on-route-transition sub-container make-tall overflow-auto">
+            <div class="fade-on-route-transition sub-container make-tall overflow-auto px-1">
                 <alert
                     ref="alertVinNotFound"
                     v-if="displayVinNotFoundAlert"
@@ -215,6 +215,7 @@ export default {
             if (!resultMap.vinLookupResponse.isStatePermissible) {
                 // State Restrictions forbid lookup by address
                 this.displayVinLookupByHomeAddressNotAllowedAlert = true;
+                this.$refs.siteFooter.disableForwardButton();
                 return this.$refs.siteFooter.removeLoader();
             }
 
@@ -268,6 +269,7 @@ export default {
             } else {
                 // No VINS found.
                 this.displayVinNotFoundAlert = true;
+                this.$refs.siteFooter.disableForwardButton();
                 return this.$refs.siteFooter.removeLoader();
             }
 
@@ -275,6 +277,7 @@ export default {
             this.isZipServiceable = resultMap.serviceZipValidationResponse.isServiceable;
             if (!this.isZipServiceable) {
                 this.displayNonServiceableZipAlert = true;
+                this.$refs.siteFooter.disableForwardButton();
                 this.showServiceZipField = true;
                 return this.$refs.siteFooter.removeLoader();
             }
@@ -353,6 +356,7 @@ export default {
             this.displayNonServiceableZipAlert = false;
             this.displayMatchedDifferentVehicleAlert = false;
             this.displayVinLookupByHomeAddressNotAllowedAlert = false;
+            this.$refs.siteFooter.enableForwardAction();
         },
     },
     mounted() {
@@ -404,7 +408,7 @@ export default {
         serviceZipCode: {
             handler(newValue) {
                 // If they modify the service zip code, then hide the error message.
-                this.displayNonServiceableZipAlert = false;
+                this.resetWarningsAndErrors();
             },
         },
         showServiceZipField: {