diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index 8818cc46..1b06361a 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -3,23 +3,32 @@
     @submit="onSubmit"
     @invalid-submit="onInvalidSubmit" >
     <div class="page-container-grouped-styles overflow-auto">
-      <siteHeader
-        cms-widget-name="SiteHeaderWidget"  />
+      <siteHeader cms-widget-name="SiteHeaderWidget" />
       <vehicleBanner
         cms-widget-name="VehicleBannerWidget"
         :display-generic-vehicle-image="false" />
-      <siteSubHeader
-        cms-widget-name="SiteSubHeaderWidget" />
-      <div class="fade-on-route-transition sub-container make-tall mt-5">
-        <textboxQuestion
-          inputId="licensePlateField"
-          cmsWidgetName="LicensePlateNumberQuestionWidget"
-          v-model="licensePlate" />
-        <textboxQuestion 
-          class="mt-4"
-          inputId="registrationZipField"
-          cmsWidgetName="RegistrationZipQuestionWidget"
-          v-model="registrationZip" />
+      <siteSubHeader cms-widget-name="SiteSubHeaderWidget" />
+      <div class="fade-on-route-transition sub-container make-tall">
+        <div class="mt-5">
+          <textboxQuestion
+            inputId="license_plate"
+            cmsWidgetName="LicensePlateNumberQuestionWidget"
+            v-model="licensePlate"
+            isRequired 
+            disableAutoFill />
+        </div>
+        <div class="mt-4">
+          <textboxQuestion 
+            inputId="zip"
+            cmsWidgetName="RegistrationZipQuestionWidget"
+            v-model="registrationZipCode"
+            isRequired
+            disableAutoFill />
+        </div>
+        <alert
+          cmsWidgetName="AlertVinNotFoundWidget"
+          alertClass="alert-danger"
+          :isDismissable="false" />
         <siteFooter
           cms-widget-name="SiteFooterWidget"
           :is-forward-action-disabled="isForwardActionDisabled"
@@ -52,10 +61,14 @@ export default {
     siteHeader,
     siteSubHeader,
     vehicleBanner,
-    textboxQuestion,    
+    textboxQuestion,
+    alert,   
   },
   data() {
-    return {};
+    return {
+      licensePlate: this.getLicensePlateFromStore(),
+      registrationZipCode: this.getRegistrationZipFromStore(),
+    };
   },
   async beforeRouteEnter(to, from, next) {
     const cmsContentPromise = fetchCmsContentForPage(to.query.issPage);
@@ -81,7 +94,10 @@ export default {
   },
   methods: {
     arePagePrerequisiteValid() {      
-      return true;
+      if (this.mainStore.order.vehicle.carId) {
+          return true;
+      }
+      return false;
     },
     backButtonAction() {
       /**
@@ -92,7 +108,16 @@ export default {
     forwardButtonAction() {
       return true;
     },
-    resetDependentState() {},
+    resetDependentState() {
+
+    },
+    getLicensePlateFromStore() {
+      return this.mainStore.order.vehicle.registration.licensePlate;
+    },
+    getRegistrationZipFromStore() {
+      return this.mainStore.order.vehicle.registration.zipCode;
+    }
+
   },
 };
 </script>