diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index fc692200..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.customerDataAddressLookup;
-        },
+
         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/store/index.js b/src/store/index.js
index 641adeb8..69477fcb 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -127,7 +127,7 @@ export const useMainStore = defineStore({
       pageData: (state) => (page) => {
           return state.applicationUser.pageData[page];
       },
-      customerDataAddressLookup: (state) => {
+      customerData: (state) => {
         if (state.order.vehicle.registration.address)
         {
           const registration = state.order.vehicle.registration;
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);