diff --git a/ayanova/src/components/pm-header.vue b/ayanova/src/components/pm-header.vue
index ca25628e..95df0263 100644
--- a/ayanova/src/components/pm-header.vue
+++ b/ayanova/src/components/pm-header.vue
@@ -301,9 +301,10 @@
         lg="4"
         xl="3"
       >
-        <v-text-field
+        <GzWoContact
           ref="customerContactName"
           v-model="value.customerContactName"
+          :pvm="pvm"
           dense
           :readonly="
             formState.readOnly ||
@@ -315,7 +316,7 @@
           data-cy="customerContactName"
           :error-messages="form().serverErrors(this, 'customerContactName')"
           @input="fieldValueChanged('customerContactName')"
-        ></v-text-field>
+        ></GzWoContact>
       </v-col>
 
       <v-col
@@ -477,10 +478,12 @@
 <script>
 import GzWoAddress from "./work-order-address.vue";
 import GZDaysOfWeek from "./days-of-week-control.vue";
+import GzWoContact from "./work-order-contact.vue";
 export default {
   components: {
     GzWoAddress,
-    GZDaysOfWeek
+    GZDaysOfWeek,
+    GzWoContact
   },
 
   props: {
diff --git a/ayanova/src/components/quote-header.vue b/ayanova/src/components/quote-header.vue
index a873f85b..5f545ba4 100644
--- a/ayanova/src/components/quote-header.vue
+++ b/ayanova/src/components/quote-header.vue
@@ -308,9 +308,10 @@
         lg="4"
         xl="3"
       >
-        <v-text-field
+        <GzWoContact
           ref="customerContactName"
           v-model="value.customerContactName"
+          :pvm="pvm"
           dense
           :readonly="
             formState.readOnly ||
@@ -322,7 +323,7 @@
           data-cy="customerContactName"
           :error-messages="form().serverErrors(this, 'customerContactName')"
           @input="fieldValueChanged('customerContactName')"
-        ></v-text-field>
+        ></GzWoContact>
       </v-col>
 
       <v-col
@@ -484,10 +485,12 @@
 <script>
 import GzQuoteState from "./quote-state.vue";
 import GzWoAddress from "./work-order-address.vue";
+import GzWoContact from "./work-order-contact.vue";
 export default {
   components: {
     GzQuoteState,
-    GzWoAddress
+    GzWoAddress,
+    GzWoContact
   },
 
   props: {
diff --git a/ayanova/src/components/work-order-header.vue b/ayanova/src/components/work-order-header.vue
index 08d78052..fd120635 100644
--- a/ayanova/src/components/work-order-header.vue
+++ b/ayanova/src/components/work-order-header.vue
@@ -275,30 +275,6 @@
         ></gz-date-time-picker>
       </v-col>
 
-      <!-- <v-col
-        v-if="form().showMe(this, 'WorkOrderCustomerContactName')"
-        cols="12"
-        sm="6"
-        lg="4"
-        xl="3"
-      >
-        <v-text-field
-          ref="customerContactName"
-          v-model="value.customerContactName"
-          dense
-          :readonly="
-            formState.readOnly ||
-              value.userIsTechRestricted ||
-              value.userIsSubContractorFull ||
-              value.userIsSubContractorRestricted
-          "
-          :label="$ay.t('WorkOrderCustomerContactName')"
-          data-cy="customerContactName"
-          :error-messages="form().serverErrors(this, 'customerContactName')"
-          @input="fieldValueChanged('customerContactName')"
-        ></v-text-field>
-      </v-col> -->
-
       <v-col
         v-if="form().showMe(this, 'WorkOrderCustomerContactName')"
         cols="12"