diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 36e0ccaaf..eedf35dd5 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -8038,6 +8038,27 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>pbs_serialnumber</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                             <concept_node>
                                                 <name>title</name>
                                                 <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/dms-customer-selector/dms-customer-selector.component.jsx b/client/src/components/dms-customer-selector/dms-customer-selector.component.jsx
index c22cbe108..992a67240 100644
--- a/client/src/components/dms-customer-selector/dms-customer-selector.component.jsx
+++ b/client/src/components/dms-customer-selector/dms-customer-selector.component.jsx
@@ -34,10 +34,7 @@ export function DmsCustomerSelector({ bodyshop }) {
     setVisible(true);
     setDmsType("pbs");
     setcustomerList(customerList);
-    console.log(
-      "🚀 ~ file: dms-customer-selector.component.jsx ~ line 37 ~ socket.on ~ customerList",
-      customerList
-    );
+
   });
 
   const onUseSelected = () => {
@@ -49,7 +46,7 @@ export function DmsCustomerSelector({ bodyshop }) {
   const onUseGeneric = () => {
     setVisible(false);
     socket.emit(
-      "cdk-selected-customer",
+      `${dmsType}selected-customer`,
       bodyshop.cdk_configuration.generic_customer_number
     );
     setSelectedCustomer(null);
@@ -57,7 +54,7 @@ export function DmsCustomerSelector({ bodyshop }) {
 
   const onCreateNew = () => {
     setVisible(false);
-    socket.emit("cdk-selected-customer", null);
+    socket.emit(`${dmsType}-selected-customer`, null);
     setSelectedCustomer(null);
   };
 
@@ -102,12 +99,6 @@ export function DmsCustomerSelector({ bodyshop }) {
       dataIndex: "ContactId",
       key: "ContactId",
     },
-    {
-      title: t("jobs.fields.dms.vinowner"),
-      dataIndex: "vinOwner",
-      key: "vinOwner",
-      render: (text, record) => <Checkbox disabled checked={record.vinOwner} />,
-    },
     {
       title: t("jobs.fields.dms.name1"),
       key: "name1",
@@ -127,6 +118,7 @@ export function DmsCustomerSelector({ bodyshop }) {
   if (!visible) return null;
   return (
     <Col span={24}>
+    {dmsType}
       <Table
         title={() => (
           <div>
diff --git a/client/src/components/shop-info/shop-info.general.component.jsx b/client/src/components/shop-info/shop-info.general.component.jsx
index 0e713a724..db379792e 100644
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -472,7 +472,7 @@ export default function ShopInfoGeneral({ form }) {
           label={t("bodyshop.fields.md_email_cc", { template: "parts_order" })}
           rules={[
             {
-              required: true,
+             
               //message: t("general.validation.required"),
               type: "array",
             },
@@ -492,7 +492,7 @@ export default function ShopInfoGeneral({ form }) {
           label={t("bodyshop.fields.md_ded_notes")}
           rules={[
             {
-              required: true,
+        
               //message: t("general.validation.required"),
               type: "array",
             },
diff --git a/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx b/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
index 0dc49cf15..acb47944e 100644
--- a/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
+++ b/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
@@ -73,7 +73,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
 
   return (
     <div>
-      {bodyshop.cdk_dealerid && (
+      {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber)&& (
         <>
           <DataLabel label={t("bodyshop.labels.dms.cdk_dealerid")}>
             {form.getFieldValue("cdk_dealerid")}
@@ -293,7 +293,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                         <Input onBlur={handleBlur} />
                       </Form.Item> */}
 
-                      {bodyshop.cdk_dealerid && (
+                      {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
                         <Form.Item
                           label={t("bodyshop.fields.dms.dms_acctnumber")}
                           key={`${index}dms_acctnumber`}
@@ -307,7 +307,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                           <Input onBlur={handleBlur} />
                         </Form.Item>
                       )}
-                      {bodyshop.cdk_dealerid && (
+                      {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
                         <Form.Item
                           label={t("bodyshop.fields.dms.dms_wip_acctnumber")}
                           key={`${index}dms_wip_acctnumber`}
@@ -430,7 +430,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                       >
                         <Input onBlur={handleBlur} />
                       </Form.Item>
-                      {bodyshop.cdk_dealerid && (
+                      {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
                         <Form.Item
                           label={t("bodyshop.fields.dms.dms_acctnumber")}
                           key={`${index}dms_acctnumber`}
@@ -470,7 +470,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
       </LayoutFormRow>
 
       <SelectorDiv>
-        {bodyshop.cdk_dealerid && (
+        {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
           <>
             <Form.List name={["md_responsibility_centers", "dms_defaults"]}>
               {(fields, { add, remove }) => {
@@ -3921,7 +3921,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
         >
           <Input />
         </Form.Item>
-        {bodyshop.cdk_dealerid && (
+        {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
           <Form.Item
             label={t("bodyshop.fields.dms.dms_acctnumber")}
             rules={[
@@ -4019,7 +4019,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
         >
           <Input />
         </Form.Item>
-        {bodyshop.cdk_dealerid && (
+        {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
           <Form.Item
             label={t("bodyshop.fields.dms.dms_acctnumber")}
             rules={[
@@ -4117,7 +4117,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
         >
           <Input />
         </Form.Item>
-        {bodyshop.cdk_dealerid && (
+        {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
           <Form.Item
             label={t("bodyshop.fields.dms.dms_acctnumber")}
             rules={[
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 733955d2b..282650cf3 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -499,6 +499,7 @@
 						"payers": "CDK Payers"
 					},
 					"cdk_dealerid": "CDK Dealer ID",
+					"pbs_serialnumber": "PBS Serial Number",
 					"title": "DMS"
 				},
 				"emaillater": "Email Later",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index b14770f10..81bf6ea38 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -499,6 +499,7 @@
 						"payers": ""
 					},
 					"cdk_dealerid": "",
+					"pbs_serialnumber": "",
 					"title": ""
 				},
 				"emaillater": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index b6f15a38a..098f83602 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -499,6 +499,7 @@
 						"payers": ""
 					},
 					"cdk_dealerid": "",
+					"pbs_serialnumber": "",
 					"title": ""
 				},
 				"emaillater": "",
diff --git a/server/accounting/pbs/pbs-job-export.js b/server/accounting/pbs/pbs-job-export.js
index dd0c264a7..056c84d0f 100644
--- a/server/accounting/pbs/pbs-job-export.js
+++ b/server/accounting/pbs/pbs-job-export.js
@@ -85,7 +85,7 @@ exports.PbsSelectedCustomer = async function PbsSelectedCustomer(
     CdkBase.createLogEvent(socket, "DEBUG", `Inserting account data.`);
     await InsertAccountPostingData(socket);
     CdkBase.createLogEvent(socket, "DEBUG", `Marking job as exported.`);
-    //  await MarkJobExported(socket, socket.JobData.id);
+    await MarkJobExported(socket, socket.JobData.id);
 
     socket.emit("export-success", socket.JobData.id);
   } catch (error) {