diff --git a/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx b/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
index e49f79d6f..8e9bb44b6 100644
--- a/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
+++ b/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
@@ -26,12 +26,6 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
   const { getFieldValue } = form;
   return (
     <div>
-      <JobsDetailRatesParts
-        jobRO={false}
-        expanded
-        required={selected && true}
-        form={form}
-      />
       <Collapse defaultActiveKey="insurance">
         <Collapse.Panel
           key="insurance"
@@ -312,6 +306,12 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
           </LayoutFormRow>
         </Collapse.Panel>
       </Collapse>
+      <JobsDetailRatesParts
+        jobRO={false}
+        expanded
+        required={selected && true}
+        form={form}
+      />
     </div>
   );
 }
diff --git a/client/src/pages/jobs-create/jobs-create.container.jsx b/client/src/pages/jobs-create/jobs-create.container.jsx
index 2bf15463b..63aabf3c0 100644
--- a/client/src/pages/jobs-create/jobs-create.container.jsx
+++ b/client/src/pages/jobs-create/jobs-create.container.jsx
@@ -155,6 +155,13 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
           layout="vertical"
           autoComplete={"off"}
           initialValues={{
+            tax_tow_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+            tax_str_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+            tax_paint_mat_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+            tax_shop_mat_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+            tax_sub_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+            tax_lbr_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+            tax_levies_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
             parts_tax_rates: {
               PAA: {
                 prt_type: "PAA",
@@ -220,6 +227,30 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
                 prt_tax_in: true,
                 prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
               },
+              PASL: {
+                prt_type: "PASL",
+                prt_discp: 0,
+                prt_mktyp: false,
+                prt_mkupp: 0,
+                prt_tax_in: true,
+                prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+              },
+              PAP: {
+                prt_type: "PAP",
+                prt_discp: 0,
+                prt_mktyp: false,
+                prt_mkupp: 0,
+                prt_tax_in: true,
+                prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+              },
+              PAO: {
+                prt_type: "PAO",
+                prt_discp: 0,
+                prt_mktyp: false,
+                prt_mkupp: 0,
+                prt_tax_in: true,
+                prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+              },
             },
           }}
         >