diff --git a/src/common-components/dropdown-question/dropdown-question.vue b/src/common-components/dropdown-question/dropdown-question.vue
index 47dc3ca1..2122bc54 100644
--- a/src/common-components/dropdown-question/dropdown-question.vue
+++ b/src/common-components/dropdown-question/dropdown-question.vue
@@ -8,8 +8,10 @@
 				:aria-disabled="isDisabled" 
 				:disabled="isDisabled" 
 				:aria-required="isRequired"
-				:validationRules="validationRules" 
+				:validationRules="validationRules"
+				:placeHolderText="placeHolderText" 
 			>
+			<option v-if="placeHolderText" value="" selected>{{ placeHolderText }}</option>
 			<option v-for="(value, name, index) in options" :value="name" :key="index">
 				{{ value }}       
 			</option>
@@ -38,7 +40,8 @@ export default {
 		validationRules: String, 
 		cmsWidgetName: String,
 		hasError: Boolean,
-		errors: Array
+		errors: Array,
+		placeHolderText: String
 	},
 	setup(props) {
 		const propsClone = Object.assign({}, props);
@@ -82,7 +85,7 @@ export default {
 		},
 		selectedOption: {
 			get: function() {
-				return this.modelValue;
+				return !this.modelValue ? "" : this.modelValue;
 			},
 			set: function(newValue) {
 				this.$emit("update:modelValue", newValue);
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index 53f6e866..1fb6868d 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -96,16 +96,7 @@ export default {
     },
     data() {
         return {
-            customerQuestions: {
-                addressQuestions: {
-                    streetAddress: "",
-                    city: "",
-                    state: "",
-                    zipCode: "",
-                },
-                firstName: "",
-                lastName: "",
-            },
+            customerQuestions: useMainStore().customerData,
             displayVinNotFoundAlert: false,
             displayMatchedDifferentVehicleAlert: false,
             displayVinLookupByHomeAddressNotAllowedAlert: false,
@@ -119,9 +110,7 @@ export default {
         arePagePrerequisitesValid() {
             return this.mainStore.order.vehicle.carId !== null;
         },
-        loadDefaultsFromStore() {
-            this.customerQuestions = this.mainStore.customerData;
-        },
+
         backButtonAction() {
             // route to move backwards
             this.$router.navigate(this.navigationScenarios.CLICKED_BACK, this.$route);
@@ -277,7 +266,7 @@ export default {
     },
     mounted() {
         this.attachCustomEvents();
-        this.loadDefaultsFromStore();
+
     },
     computed: {
         AlertMatchedDifferentVehicleHeader() {
diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue
index 57c3d583..0b411a64 100644
--- a/src/layouts/welcome-page/welcome-page.vue
+++ b/src/layouts/welcome-page/welcome-page.vue
@@ -47,6 +47,7 @@
                         :options="DamageCauseOptions"
                         disableAutoFill
                         validationRules="loss-cause-required"
+                        placeHolderText="Select an option"
                     />
                 </div>
             </div>
@@ -73,6 +74,7 @@
                         validationRules="loss-state-required" 
                         isRequired
                         disableAutoFill
+                        placeHolderText="Select an option"
                     />
                 </div>    
             </div>
diff --git a/src/store/index.js b/src/store/index.js
index 7e781a20..f77a7180 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -128,7 +128,7 @@ export const useMainStore = defineStore({
           return state.applicationUser.pageData[page];
       },
       customerData: (state) => {
-        if (state.order.vehicle.registration.zipCode)
+        if (state.order.vehicle.registration.address)
         {
           const registration = state.order.vehicle.registration;
           return {
diff --git a/src/store/store.spec.js b/src/store/store.spec.js
index c8721b6d..e282f849 100644
--- a/src/store/store.spec.js
+++ b/src/store/store.spec.js
@@ -181,7 +181,7 @@ describe("Store", () => {
         };
 
         //Act
-        const actual = store.customerDataAddressLookup;
+        const actual = store.customerData;
         //Assert
 
         expect(actual).toEqual(expected);
@@ -213,7 +213,7 @@ describe("Store", () => {
         };
 
         //Act
-        const actual = store.customerDataAddressLookup;
+        const actual = store.customerData;
         //Assert
 
         expect(actual).toEqual(expected);