diff --git a/src/helpers/cms-content-helper.js b/src/helpers/cms-content-helper.js
index bb2967e7..430ebb6f 100644
--- a/src/helpers/cms-content-helper.js
+++ b/src/helpers/cms-content-helper.js
@@ -13,12 +13,10 @@ export function fetchCmsContentForPage(issPage) {
       (baseResponse) => {
         if ( !clientOverride )
         {
-          setClientTag(clientName,accountNumber);
           // Return the base page if there are no client override.
           return processPageData(baseResponse, null);
         }
         else {
-          setClientTag(clientName,accountNumber);
           // Else get the client override page.
           const pageName = issPage + "_" + clientName.toLowerCase().replace(/ /g, "");
 
@@ -116,17 +114,6 @@ function processPageData(baseResponse, clientResponse) {
   });
 
   return pageDataFromCms;
-}
-//ClientTag function to identify essential or advance flow
-function setClientTag(clientName,accountNumber)
-{
-  const storeState = useMainStore();
-  if(clientName !="Generic Insurance" && accountNumber){
-    storeState.issConfig.flowType = "Advanced Flow";
-  }   
-  if(clientName =="Generic Insurance" && accountNumber==0){
-    storeState.issConfig.flowType = "Essential Flow";
-  } 
 }
   // Parent function for processWidgetItemForReplacement. This will loop through the parent
 // object and pass any objects that need additional processing to the processWidgetItemForReplacement function.
diff --git a/src/layouts/welcome-page/welcome-page.spec.js b/src/layouts/welcome-page/welcome-page.spec.js
index 0fa1578f..195f129d 100644
--- a/src/layouts/welcome-page/welcome-page.spec.js
+++ b/src/layouts/welcome-page/welcome-page.spec.js
@@ -35,7 +35,6 @@ describe("welcome-page.vue", () => {
         const glassOnlyDamage = wrapper.findComponent({ ref: "glassOnlyDamage" });
         const phoneNumber = wrapper.findComponent({ ref: "phoneNumber" });
         const email = wrapper.findComponent({ ref: "email" });
-        const policyZip = wrapper.findComponent({ ref: "policyZip" });
 
 
         // Assert
@@ -47,7 +46,6 @@ describe("welcome-page.vue", () => {
         expect(glassOnlyDamage.exists()).toBe(false);
         expect(phoneNumber.exists()).toBe(true);
         expect(email.exists()).toBe(true);
-        expect(policyZip.exists()).toBe(false);
     });
 });
 
diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue
index 652744bb..c26a31d2 100644
--- a/src/layouts/welcome-page/welcome-page.vue
+++ b/src/layouts/welcome-page/welcome-page.vue
@@ -17,16 +17,13 @@
                             validationRules="policy-number-required" />
                         </div>
                     </div>
-                    <div class="row mt-4 px-3">
+                    <div class="row mt-4 px-3" v-if="this.displayPolicyZip">
                         <div class="col">
                             <textboxQuestion
                             inputId="policyZipCode"
                             cmsWidgetName="PolicyZipQuestion"
-                            v-model="welcomePageModel.policyZip"
                             isRequired
-                            ref="policyZip"
-                            v-if="this.displayPolicyZip"
-                            validationRules="policy-zip-required|policy-zip-format" />
+                            ref="policyZip" />
                         </div>
                     </div>
                     <div class="row mt-4 px-3">
@@ -349,7 +346,10 @@ export default {
             return !!this.getCmsContent("GlassOnlyQuestion","QuestionText");
         },
         displayPolicyZip(){
-            if(this.mainStore.issConfig.flowType=="Essential Flow"){
+            if(this.mainStore.issConfig.isAuthenticated){
+                return false;
+            }
+            else{
                 return true;
             }
         }
diff --git a/src/store/index.js b/src/store/index.js
index b479a428..1e7a483c 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -107,7 +107,6 @@ const getDefaultState = () => {
       enableTPAFlow: false, // Indicates if the TPA flow is supported for this client.
       returnURL: null,
       returnURL2: null,
-      flowType:"",
     }
   };
 };
@@ -618,7 +617,6 @@ export const useMainStore = defineStore({
         this.issConfig.enableTPAFlow = false;
         this.issConfig.returnURL = null;
         this.issConfig.returnURL2 = null;
-        this.issConfig.flowType="";
       },
 
       updateVehicleYear(year) {