diff --git a/client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx b/client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx
index 8a4b26e6b..4c8704d96 100644
--- a/client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx
+++ b/client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx
@@ -36,8 +36,11 @@ export function JobsDetailRates({ jobRO, form, job }) {
             <CurrencyInput
               disabled={jobRO}
               max={
-                ((job.job_totals && job.job_totals.totals.federal_tax.amount) ||
-                  0) / 100
+                Math.round(
+                  (job.job_totals &&
+                    job.job_totals.totals.federal_tax.amount) ||
+                    0
+                ) / 100
               }
             />
           </Form.Item>
diff --git a/server/job/job-totals.js b/server/job/job-totals.js
index dea522a89..e31c34ec2 100644
--- a/server/job/job-totals.js
+++ b/server/job/job-totals.js
@@ -428,8 +428,8 @@ function CalculateTaxesTotals(job, otherTotals) {
   ret.custPayable = {
     deductible: Dinero({ amount: (job.ded_amt || 0) * 100 }) || 0,
     federal_tax: job.ca_gst_registrant
-      ? job.ca_customer_gst !== 0
-        ? Dinero({ amount: job.ca_customer_gst * 100 })
+      ? job.ca_customer_gst !== 0 || job.ca_customer_gst !== null
+        ? Dinero({ amount: Math.round(job.ca_customer_gst * 100) })
         : ret.federal_tax
       : Dinero(),
     other_customer_amount: Dinero({