diff --git a/src/layouts/welcome-page/welcome-page.spec.js b/src/layouts/welcome-page/welcome-page.spec.js
index 48bb9080..69ab6edc 100644
--- a/src/layouts/welcome-page/welcome-page.spec.js
+++ b/src/layouts/welcome-page/welcome-page.spec.js
@@ -47,6 +47,30 @@ describe("welcome-page.vue", () => {
         expect(phoneNumber.exists()).toBe(true);
         expect(email.exists()).toBe(true);
     });
+    test("Policy zip field should be visible if coverage is enabled", async () => {
+        // Arrange   
+        const { wrapper } = setupMocks({});     
+        useMainStore().issConfig.isCoverageEnabled = true;  
+        
+        // Act
+        await wrapper.vm.$nextTick();
+        const policyZip = wrapper.findComponent({ ref: "policyZip" });
+        
+        // Assert
+        expect(policyZip.exists()).toBe(true);
+    });
+    test("Policy zip field should be hidden if coverage is not enabled", async () => {
+        // Arrange   
+        const { wrapper } = setupMocks({});     
+        useMainStore().issConfig.isCoverageEnabled = false;  
+        
+        // Act
+        await wrapper.vm.$nextTick();
+        const policyZip = wrapper.findComponent({ ref: "policyZip" });
+        
+        // Assert
+        expect(policyZip.exists()).toBe(false);
+    });
 });
 
 describe("navigation", () => {
@@ -75,12 +99,13 @@ describe("navigation", () => {
         });
 
         await wrapper.setData({
-            isCoverageEnabled: true,
+            vehiclesFound: mockvehicles,
         });
-        
+
+        useMainStore().issConfig.isCoverageEnabled = true;
         useMainStore().order.policy.policyNumber = "p_0001";
         useMainStore().order.policy.dateOfLoss = "2022-01-28";
-        useMainStore().order.accountNumber = "00000";        
+        useMainStore().order.accountNumber = "00000";  
 
         // Act
         await wrapper.vm.forwardButtonAction();
@@ -101,11 +126,10 @@ describe("navigation", () => {
         });
 
         await wrapper.setData({
-            isCoverageEnabled: true,
-            vehiclesCount: 0,
             vehiclesFound: null,
         });
         
+        useMainStore().issConfig.isCoverageEnabled = true;
         useMainStore().order.policy.policyNumber = "p_0001";
         useMainStore().order.policy.dateOfLoss = "2022-01-28";
         useMainStore().order.accountNumber = "00000";        
@@ -126,10 +150,7 @@ describe("navigation", () => {
             policies: null
         });
 
-        await wrapper.setData({
-            isCoverageEnabled: true,
-        });
-        
+        useMainStore().issConfig.isCoverageEnabled = true;
         useMainStore().order.policy.policyNumber = "p_0001";
         useMainStore().order.policy.dateOfLoss = "2022-01-28";
         useMainStore().order.accountNumber = "00000";
diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue
index c36a9a0b..deb72b76 100644
--- a/src/layouts/welcome-page/welcome-page.vue
+++ b/src/layouts/welcome-page/welcome-page.vue
@@ -18,7 +18,7 @@
                             validationRules="policy-number-required" />
                         </div>
                     </div>
-                    <div class="row mt-4" v-if="this.displayPolicyZip">
+                    <div class="row mt-4" v-if="this.isCoverageEnabled">
                         <div class="col">
                             <textboxQuestion
                             inputId="policyZipCode"
@@ -356,15 +356,6 @@ export default {
         displayGlassOnlyQuestion() {
             return !!this.getCmsContent("GlassOnlyQuestion","QuestionText");
         },
-        displayPolicyZip() {
-            if (this.mainStore.issConfig.isAuthenticated &&
-                !!this.mainStore.issConfig.disabledFields.policyZipCode) {
-                return false;
-            }
-            else{
-                return true;
-            }
-        },
         getStates() {
             return states;
         },