diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 4e36ac96e..1f8f8bb05 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -4509,6 +4509,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>enforce_conversion_csr</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>enforce_referral</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
index 2f5e5b39a..1a7f85d75 100644
--- a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
+++ b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
@@ -83,7 +83,11 @@ export function JobsConvertButton({
         layout="vertical"
         form={form}
         onFinish={handleConvert}
-        initialValues={{ driveable: true, towin: false }}
+        initialValues={{
+          driveable: true,
+          towin: false,
+          employee_csr: job.employee_csr,
+        }}
       >
         <Form.Item
           name={["ins_co_nm"]}
@@ -151,6 +155,41 @@ export function JobsConvertButton({
             </Form.Item>
           </>
         )}
+        {bodyshop.enforce_conversion_csr && (
+          <Form.Item
+            name={"employee_csr"}
+            label={t("jobs.fields.employee_csr")}
+            rules={[
+              {
+                required: bodyshop.enforce_conversion_csr,
+                //message: t("general.validation.required"),
+              },
+            ]}
+          >
+            <Select
+              showSearch
+              style={{ width: 200 }}
+              optionFilterProp="children"
+              filterOption={(input, option) =>
+                option.props.children
+                  .toLowerCase()
+                  .indexOf(input.toLowerCase()) >= 0
+              }
+            >
+              {bodyshop.employees
+                .filter((emp) => emp.active)
+                .map((emp) => (
+                  <Select.Option
+                    value={emp.id}
+                    key={emp.id}
+                    name={`${emp.first_name} ${emp.last_name}`}
+                  >
+                    {`${emp.first_name} ${emp.last_name}`}
+                  </Select.Option>
+                ))}
+            </Select>
+          </Form.Item>
+        )}
         <Form.Item
           label={t("jobs.fields.ca_gst_registrant")}
           name="ca_gst_registrant"
@@ -194,7 +233,10 @@ export function JobsConvertButton({
         // style={{ display: job.converted ? "none" : "" }}
         disabled={job.converted || jobRO}
         loading={loading}
-        onClick={() => setVisible(true)}
+        onClick={() => {
+          setVisible(true);
+          form.resetFields();
+        }}
       >
         {t("jobs.actions.convert")}
       </Button>
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 f6f2ba641..8d9a63706 100644
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -466,6 +466,13 @@ export default function ShopInfoGeneral({ form }) {
         >
           <Switch />
         </Form.Item>
+        <Form.Item
+          name={["enforce_conversion_csr"]}
+          label={t("bodyshop.fields.enforce_conversion_csr")}
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
         <Form.Item
           name={["target_touchtime"]}
           label={t("bodyshop.fields.target_touchtime")}
diff --git a/client/src/graphql/bodyshop.queries.js b/client/src/graphql/bodyshop.queries.js
index de1ed240d..cfefde25c 100644
--- a/client/src/graphql/bodyshop.queries.js
+++ b/client/src/graphql/bodyshop.queries.js
@@ -111,6 +111,7 @@ export const QUERY_BODYSHOP = gql`
       localmediaserverhttp
       localmediaservernetwork
       localmediatoken
+      enforce_conversion_csr
       employees {
         user_email
         id
@@ -220,6 +221,7 @@ export const UPDATE_SHOP = gql`
         localmediaserverhttp
         localmediaservernetwork
         localmediatoken
+        enforce_conversion_csr
         employees {
           id
           first_name
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index 2dd12f5cd..bf2ccb08b 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -501,6 +501,10 @@ export const GET_JOB_BY_PK = gql`
         first_name
         last_name
       }
+      employee_csr
+      employee_prep
+      employee_refinish
+      employee_body
       alt_transport
       intakechecklist
       invoice_final_note
@@ -1153,6 +1157,7 @@ export const CONVERT_JOB_TO_RO = gql`
     $towin: Boolean
     $referral_source: String
     $referral_source_extra: String
+    $employee_csr: uuid
   ) {
     update_jobs(
       where: { id: { _eq: $jobId } }
@@ -1165,6 +1170,7 @@ export const CONVERT_JOB_TO_RO = gql`
         driveable: $driveable
         referral_source: $referral_source
         referral_source_extra: $referral_source_extra
+        employee_csr: $employee_csr
       }
     ) {
       returning {
@@ -1175,6 +1181,10 @@ export const CONVERT_JOB_TO_RO = gql`
         ins_co_nm
         referral_source
         referral_source_extra
+        employee_csr
+        employee_csr_rel {
+          id
+        }
       }
     }
   }
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index b0ee30cdc..406b8b11b 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -279,6 +279,7 @@
 				},
 				"email": "General Shop Email",
 				"enforce_class": "Enforce Class on Conversion?",
+				"enforce_conversion_csr": "Enforce CSR on Conversion?",
 				"enforce_referral": "Enforce Referrals",
 				"federal_tax_id": "Federal Tax ID (GST/HST)",
 				"ignoreblockeddays": "Scoreboard - Ignore Blocked Days",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index e8b5d5b0a..7bffa8281 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -279,6 +279,7 @@
 				},
 				"email": "",
 				"enforce_class": "",
+				"enforce_conversion_csr": "",
 				"enforce_referral": "",
 				"federal_tax_id": "",
 				"ignoreblockeddays": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index d11be3eb6..e2c5a5be2 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -279,6 +279,7 @@
 				},
 				"email": "",
 				"enforce_class": "",
+				"enforce_conversion_csr": "",
 				"enforce_referral": "",
 				"federal_tax_id": "",
 				"ignoreblockeddays": "",
diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index 79a4dad70..288fd4242 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -855,6 +855,7 @@
           - deliverchecklist
           - email
           - enforce_class
+          - enforce_conversion_csr
           - enforce_referral
           - entegral_configuration
           - entegral_id
@@ -951,6 +952,7 @@
           - deliverchecklist
           - email
           - enforce_class
+          - enforce_conversion_csr
           - enforce_referral
           - federal_tax_id
           - id
diff --git a/hasura/migrations/1672695435314_alter_table_public_bodyshops_add_column_enforce_conversion_csr/down.sql b/hasura/migrations/1672695435314_alter_table_public_bodyshops_add_column_enforce_conversion_csr/down.sql
new file mode 100644
index 000000000..be3dbfc5d
--- /dev/null
+++ b/hasura/migrations/1672695435314_alter_table_public_bodyshops_add_column_enforce_conversion_csr/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."bodyshops" add column "enforce_conversion_csr" boolean
+--  null default 'false';
diff --git a/hasura/migrations/1672695435314_alter_table_public_bodyshops_add_column_enforce_conversion_csr/up.sql b/hasura/migrations/1672695435314_alter_table_public_bodyshops_add_column_enforce_conversion_csr/up.sql
new file mode 100644
index 000000000..7d5b2c079
--- /dev/null
+++ b/hasura/migrations/1672695435314_alter_table_public_bodyshops_add_column_enforce_conversion_csr/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "enforce_conversion_csr" boolean
+ null default 'false';