diff --git a/src/layouts/entry-page/entry-page.vue b/src/layouts/entry-page/entry-page.vue
index db24c722..8fa467d5 100644
--- a/src/layouts/entry-page/entry-page.vue
+++ b/src/layouts/entry-page/entry-page.vue
@@ -144,6 +144,7 @@
                     {
                         case "policynumber":
                             this.mainStore.order.policy.policyNumber = value;
+                            this.mainStore.issConfig.disabledFields.policyNumber = true;
                             break;
 
                         case "lossdate":
diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue
index 2054987e..3757e2e4 100644
--- a/src/layouts/welcome-page/welcome-page.vue
+++ b/src/layouts/welcome-page/welcome-page.vue
@@ -14,6 +14,7 @@
                             isRequired
                             ref="policyNumber"
                             disableAutoFill
+                            :isDisabled="isPolicyHolderEnabled"
                             validationRules="policy-number-required" />
                         </div>
                     </div>
@@ -107,7 +108,7 @@
                             v-model="welcomePageModel.damageState"
                             ref="state"
                             inputId="8fdf9dc2e13e430eb57529499dceb3eb"
-                            :options="stateOptions"
+                            :options="getStates"
                             validationRules="loss-state-required"
                             isRequired
                             disableAutoFill
@@ -166,6 +167,7 @@ import { required, regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
 import BaseFormMixin from '@/mixins/base-form-mixin.js';
 import { useMainStore } from '@/store';
+import { states } from "@/constants/states"
 
 //define validation rules
 defineRule("loss-date-required", required(errorMessages.LOSS_DATE_REQUIRED));
@@ -253,6 +255,7 @@ export default {
                 isDamageGlassOnly : this.mainStore.order.policy.isDamageGlassOnly,
                 phoneNumber : this.mainStore.order.customer.phoneNumber,
                 email : this.mainStore.order.customer.emailAddress,
+                isPolicyNumberDisabled: this.mainStore.order.policy.isPolicyNumberDisabled,
             }
         },
     },
@@ -278,63 +281,6 @@ export default {
         {
             return this.getCmsContent("GlassOnlyQuestion", "QuestionText");
         },
-        stateOptions: {
-            get: function () {
-                return {
-                    AL: "Alabama",
-                    AK: "Alaska",
-                    AZ: "Arizona",
-                    AR: "Arkansas",
-                    CA: "California",
-                    CO: "Colorado",
-                    CT: "Connecticut",
-                    DE: "Delaware",
-                    DC: "District Of Columbia",
-                    FL: "Florida",
-                    GA: "Georgia",
-                    HI: "Hawaii",
-                    ID: "Idaho",
-                    IL: "Illinois",
-                    IN: "Indiana",
-                    IA: "Iowa",
-                    KS: "Kansas",
-                    KY: "Kentucky",
-                    LA: "Louisiana",
-                    ME: "Maine",
-                    MD: "Maryland",
-                    MA: "Massachusetts",
-                    MI: "Michigan",
-                    MN: "Minnesota",
-                    MS: "Mississippi",
-                    MO: "Missouri",
-                    MT: "Montana",
-                    NE: "Nebraska",
-                    NV: "Nevada",
-                    NH: "New Hampshire",
-                    NJ: "New Jersey",
-                    NM: "New Mexico",
-                    NY: "New York",
-                    NC: "North Carolina",
-                    ND: "North Dakota",
-                    OH: "Ohio",
-                    OK: "Oklahoma",
-                    OR: "Oregon",
-                    PA: "Pennsylvania",
-                    RI: "Rhode Island",
-                    SC: "South Carolina",
-                    SD: "South Dakota",
-                    TN: "Tennessee",
-                    TX: "Texas",
-                    UT: "Utah",
-                    VT: "Vermont",
-                    VA: "Virginia",
-                    WA: "Washington",
-                    WV: "West Virginia",
-                    WI: "Wisconsin",
-                    WY: "Wyoming",
-                };
-            },
-        },
         displayDamageCityQuestion(){
             return !!this.getCmsContent("DamageCityQuestion","QuestionText");
         },
@@ -351,6 +297,13 @@ export default {
             else{
                 return true;
             }
+        },
+        getStates() {
+            return states;
+        },
+        isPolicyHolderEnabled()
+        {
+            return !!this.mainStore.issConfig.disabledFields.policyNumber;
         }
     },
     components: {
diff --git a/src/store/index.js b/src/store/index.js
index 0c28351f..cc605891 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -47,7 +47,7 @@ const getDefaultState = () => {
         damageCause: null,
         damageState: null,
         damageCity: null,
-        isDamageGlassOnly: null
+        isDamageGlassOnly: null,
       },
       customer: {
         address: {
@@ -104,7 +104,10 @@ const getDefaultState = () => {
       isAuthenticated: false, // Indicates if user is authenticated or not.
       enableTPAFlow: false, // Indicates if the TPA flow is supported for this client.
       returnURL: null,
-      returnURL2: null
+      returnURL2: null,
+      disabledFields: {
+        policyNumber: null
+      }
     }
   };
 };
@@ -716,6 +719,7 @@ export const useMainStore = defineStore({
         this.issConfig.enableTPAFlow = false;
         this.issConfig.returnURL = null;
         this.issConfig.returnURL2 = null;
+        this.issConfig.disabledFields.policyNumber = null;
       },
 
       updateVehicleYear(year) {