diff --git a/CHANGELOG.md b/CHANGELOG.md
index b85b18f7..5797ed84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,6 @@ This file documents all notable changes made to ITFlow.
 
 ### Breaking Changes
 - Renamed `/user/` directory to `/agent/`.
-- Stripe users: Payment Provider Threshold is now enforced. Be sure to configure your desired threshold amount. (It is set to 0 by default) meaning nonone can pay via stripe. If the invoice amount is greater than than the Threshold amount, clients will not be able to pay that invoice via Stripe Pay.
 - Deprecation Notice: `/scripts/cron_mail_queue.php` and `/scripts/cron_ticket_email_parser.php` are being phased out. Please transition to `/cron/mail_queue.php` and `/cron/ticket_email_parser.php`. These older scripts will be removed in the November release—update accordingly. New Installs via the script will have this already configured.
 - Custom is working now. Custom code should be placed in /admin/custom/ , /agent/custom/ , /client/custom/ /guest/custom/
 We will provide example code with directory structure for each custom directory a week after this release.
@@ -22,7 +21,7 @@ We will provide example code with directory structure for each custom directory
 - Resolved MFA enforcement bugs.
 - Fixed KeepAlive functionality to maintain user sessions longer.
 - Fixed multiple broken links caused by the `/user/` to `/agent/` path migration.
-- Fixed Cusom
+- Fixed Custom code directories.
 
 ### Added / Changed
 - Removed "ACH" as a payment method; added "Bank Transfer" instead.
diff --git a/admin/modals/payment_provider/payment_provider_add.php b/admin/modals/payment_provider/payment_provider_add.php
index f464e97c..54b52182 100644
--- a/admin/modals/payment_provider/payment_provider_add.php
+++ b/admin/modals/payment_provider/payment_provider_add.php
@@ -56,9 +56,9 @@
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
                             </div>
-                            <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="threshold" value="5000.00" placeholder="9999.00">
+                            <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="threshold" placeholder="1000.00">
                         </div>
-                        <small class="form-text text-muted">Will not show as an option at Checkout if above this number</small>
+                        <small class="form-text text-muted">Will not show as an option at Checkout if invoice amount is above this number, 0 disables the threshold check.</small>
                     </div>
 
                     <hr>
diff --git a/client/unpaid_invoices.php b/client/unpaid_invoices.php
index 9bca00aa..9f6f6271 100644
--- a/client/unpaid_invoices.php
+++ b/client/unpaid_invoices.php
@@ -142,9 +142,16 @@ $balance = $invoice_amounts - $amount_paid;
                     <td><?php echo $invoice_date; ?></td>
                     <td class="<?php echo $overdue_color; ?>"><?php echo $invoice_due; ?></td>
                     <td>
-                        <?php 
-                        if ($invoice_status !== "Paid" && $invoice_status  !== "Cancelled" && $invoice_status !== "Draft" && $payment_provider_id && $payment_provider_threshold > $invoice_amount) {
-                        ?>
+                        <?php
+                        if ($invoice_status !== "Paid" &&
+                            $invoice_status  !== "Cancelled" &&
+                            $invoice_status !== "Draft" &&
+                            $payment_provider_id &&
+                            (
+                                $payment_provider_threshold == 0 ||
+                                $payment_provider_threshold > $invoice_amount
+                            ) 
+                        ){ ?>
                         <button type="button" class="btn btn-sm btn-outline-success dropdown-toggle" data-toggle="dropdown"><i class="fa fa-fw fa-credit-card mr-2"></i>Pay</button>
                         <div class="dropdown-menu">
                             <a class="dropdown-item" href="//<?php echo $config_base_url ?>/guest/guest_pay_invoice_stripe.php?invoice_id=<?php echo "$invoice_id&url_key=$invoice_url_key"; ?>">Enter Card Manually</a>
diff --git a/guest/guest_view_invoice.php b/guest/guest_view_invoice.php
index 13003f69..4e1ed287 100644
--- a/guest/guest_view_invoice.php
+++ b/guest/guest_view_invoice.php
@@ -173,7 +173,15 @@ if ($balance > 0) {
                         <i class="fa fa-fw fa-download mr-2"></i>Download
                     </a>
                     <?php
-                    if ($invoice_status !== "Paid" && $invoice_status  !== "Cancelled" && $invoice_status !== "Draft" && $payment_provider_id && $payment_provider_threshold > $invoice_amount) { ?>
+                    if ($invoice_status !== "Paid" &&
+                        $invoice_status  !== "Cancelled" &&
+                        $invoice_status !== "Draft" &&
+                        $payment_provider_id &&
+                        (
+                            $payment_provider_threshold == 0 ||
+                            $payment_provider_threshold > $invoice_amount
+                        ) 
+                    ){ ?>
                         <a class="btn btn-success" href="guest_pay_invoice_stripe.php?invoice_id=<?php echo $invoice_id; ?>&url_key=<?php echo $url_key; ?>"><i class="fa fa-fw fa-credit-card mr-2"></i>Pay Now </a>
                     <?php } ?>
                 </div>