diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue
index e29f1fd93..29f7b24ab 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@@ -158,11 +158,11 @@ export default {
 
 <style lang="scss" scoped>
 .button-question-overflow {
-  height: calc(100vh - 252px);
+  height: calc(100vh - 266px);
 
   .overflow-scroll {
     // Height will be determined by overall height of content above list
-    height: calc(100% - 300px);
+    height: calc(100% - 314px);
     overflow-x: hidden !important;
     -webkit-overflow-scrolling: touch;
   }
diff --git a/src/common-components/vehicle-banner/vehicle-banner.vue b/src/common-components/vehicle-banner/vehicle-banner.vue
index ed0b2685a..3435efab9 100644
--- a/src/common-components/vehicle-banner/vehicle-banner.vue
+++ b/src/common-components/vehicle-banner/vehicle-banner.vue
@@ -75,6 +75,6 @@ export default {
   max-width: 290px;
   object-fit: cover;
   width: 100%;
-  height: 118px;
+  height: 132px;
 }
 </style>
diff --git a/src/helpers/damage-helper.spec.js b/src/helpers/damage-helper.spec.js
index 1370b8e47..cd54dddcd 100644
--- a/src/helpers/damage-helper.spec.js
+++ b/src/helpers/damage-helper.spec.js
@@ -1,4 +1,5 @@
-import {getDamageString, compareGlassOptions} from "./damage-helper";
+import {getDamageString, isGlassAvailableForCarId} from "./damage-helper";
+import baseMixin from "@/mixins/base-mixin.js";
 
 jest.mock("@/store", () => ({
     getters: {damage: {
@@ -16,11 +17,13 @@ jest.mock("@/store", () => ({
 
   // describe("damage-helper.js", () => {
   //   it("Should return false if no mismatches between each array", () => {
-  //     const newOptions = {
+  //     const updatedOptions = {
   //       windshieldOptions: {availableReplacementOptions: ["windshield"]}
   //     }
-  //     const currentOptions = [{location: "Windshield", name: "windshield"}];
-  //     const misMatch = compareGlassOptions(newOptions, currentOptions);
+  //     baseMixin.methods.dispatchNonBlockingStoreAction = jest.fn().mockImplementation(()=> {
+  //       return updatedOptions;
+  //     });
+  //     const misMatch = isGlassAvailableForCarId('carId');
   //     expect(misMatch).toEqual(false);
   //   });
   // });
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index 99275fc2c..87605d790 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -28,9 +28,14 @@
         class="my-3"
         :manualHeadline="NoServiceZipHeader"
         :manualCopy="NoServiceZipBody"
-        v-if="!isRegistrationZipIServicable"
+        v-if="!isRegistrationZipIServicable && isVinValid && !isCarIdDifferent"
         alertClass="alert-danger"
       />
+      <div class="row my-2">
+        <div class="col">
+          <textboxQuestion v-if="!isRegistrationZipIServicable" cmsWidgetName="ServiceZip" v-model="serviceZip" inputId="serviceZip"  validationRules="zip-required" />
+        </div>
+      </div>
       <alert
         class="my-3"
         cmsWidgetName="NoMatchAlertWidget"
@@ -44,11 +49,6 @@
         v-if="isCarIdDifferent"
         alertClass="alert-warning"
       />
-      <div class="row my-2">
-        <div class="col">
-          <textboxQuestion v-if="!isRegistrationZipIServicable" cmsWidgetName="ServiceZip" v-model="serviceZip" inputId="serviceZip"  validationRules="zip-required" />
-        </div>
-      </div>
       <funnelFooter
         ref="funnelFooter"
         cmsWidgetName="FunnelFooterWidget"
@@ -118,10 +118,10 @@ export default {
       isRegistrationZipIServicable: true,
       isVinValid: true,
       isCarIdDifferent: false,
-      licensePlate: '',
-      registrationZip: '',
-      email: '',
-      serviceZip: '',
+      licensePlate: this.getLicensePlateFromStore(),
+      registrationZip: this.getRegistrationZipFromStore(),
+      email: this.getEmailFromStore(),
+      serviceZip: this.getServiceZipFromStore(),
       previouslyEnteredCarId: '',
       customAlertData: {},
       isSelectedGlassAvailableForVehicle: true,
@@ -158,6 +158,18 @@ export default {
       store.commit(storeMutations.UPDATE_REGISTRATION_LAST_NAME, null);
       store.dispatch(storeActions.RESET_PARTS_STATE_AND_DEPENDENCIES);
     },
+    getLicensePlateFromStore(){
+      return store.getters.vehicle.registration.licensePlate
+    },
+    getRegistrationZipFromStore(){
+      return store.getters.vehicle.registration.zipCode
+    },
+    getEmailFromStore(){
+      return store.getters.order.customer.emailAddress
+    },
+    getServiceZipFromStore(){
+      return store.getters.order.serviceLocation.zip
+    },
     backButtonAction() {
       this.$router.navigate(this.navigationScenarios.CLICKED_BACK, this.$route);
     },