diff --git a/client/src/components/contract-form/contract-form.component.jsx b/client/src/components/contract-form/contract-form.component.jsx
index b61bc6f2c..f41933625 100644
--- a/client/src/components/contract-form/contract-form.component.jsx
+++ b/client/src/components/contract-form/contract-form.component.jsx
@@ -4,7 +4,7 @@ import moment from "moment";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { DateFormatter } from "../../utils/DateFormatter";
-import ContractLicenseDecodeButton from "../contract-license-decode-button/contract-license-decode-button.component";
+//import ContractLicenseDecodeButton from "../contract-license-decode-button/contract-license-decode-button.component";
 import ContractStatusSelector from "../contract-status-select/contract-status-select.component";
 import ContractsRatesChangeButton from "../contracts-rates-change-button/contracts-rates-change-button.component";
 import CourtesyCarFuelSlider from "../courtesy-car-fuel-select/courtesy-car-fuel-select.component";
@@ -165,7 +165,9 @@ export default function ContractFormComponent({
               />
             </div>
           )}
-          <ContractLicenseDecodeButton form={form} />
+          {
+            //<ContractLicenseDecodeButton form={form} />
+          }
         </Space>
       </div>
       <LayoutFormRow header={t("contracts.labels.driverinformation")}>
diff --git a/client/src/components/payment-modal/payment-modal.container.jsx b/client/src/components/payment-modal/payment-modal.container.jsx
index 4b270bca5..b7152b8e3 100644
--- a/client/src/components/payment-modal/payment-modal.container.jsx
+++ b/client/src/components/payment-modal/payment-modal.container.jsx
@@ -7,14 +7,14 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import {
   INSERT_NEW_PAYMENT,
-  UPDATE_PAYMENT
+  UPDATE_PAYMENT,
 } from "../../graphql/payments.queries";
 import { setEmailOptions } from "../../redux/email/email.actions";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectPayment } from "../../redux/modals/modals.selectors";
 import {
   selectBodyshop,
-  selectCurrentUser
+  selectCurrentUser,
 } from "../../redux/user/user.selectors";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
@@ -124,7 +124,11 @@ function PaymentModalContainer({
   };
 
   useEffect(() => {
-    if (visible) form.resetFields();
+    if (visible) {
+      form.resetFields();
+      form.resetFields();
+      form.setFieldsValue(context);
+    }
   }, [visible, form, context]);
 
   useEffect(() => {
@@ -139,6 +143,7 @@ function PaymentModalContainer({
           : t("payments.labels.edit")
       }
       visible={visible}
+      destroyOnClose
       okText={t("general.actions.save")}
       onOk={() => form.submit()}
       width="50%"
diff --git a/client/src/pages/manage/manage.page.component.jsx b/client/src/pages/manage/manage.page.component.jsx
index 7a71f2cd1..f8ed14fcd 100644
--- a/client/src/pages/manage/manage.page.component.jsx
+++ b/client/src/pages/manage/manage.page.component.jsx
@@ -193,9 +193,8 @@ export function Manage({ match, conflict, bodyshop }) {
     <Suspense
       fallback={<LoadingSpinner message={t("general.labels.loadingapp")} />}
     >
-  
-        <PaymentModalContainer />
-    
+      <PaymentModalContainer />
+
       <BreadCrumbs />
       <BillEnterModalContainer />
       <JobCostingModal />
diff --git a/server/data/autohouse.js b/server/data/autohouse.js
index 3bfcdae64..405a3e8a2 100644
--- a/server/data/autohouse.js
+++ b/server/data/autohouse.js
@@ -814,7 +814,11 @@ const CreateCosts = (job) => {
       ].add(
         Dinero({
           amount: Math.round((ticket_val.rate || 0) * 100),
-        }).multiply(ticket_val.actualhrs || ticket_val.productivehrs || 0)
+        }).multiply(
+          (ticket_val.flat_rate
+            ? ticket_val.productivehrs
+            : ticket_val.actualhrs) || 0
+        )
       );
 
       return ticket_acc;
diff --git a/server/graphql-client/queries.js b/server/graphql-client/queries.js
index 88ff022ac..de12f518e 100644
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -775,6 +775,7 @@ exports.AUTOHOUSE_QUERY = `query AUTOHOUSE_EXPORT($start: timestamptz, $bodyshop
       cost_center
       actualhrs
       productivehrs
+      flat_rate
     }
     area_of_damage
     employee_prep_rel {