diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php
index 710dc26ce331..7a57a79b56fd 100644
--- a/app/Ninja/Repositories/InvoiceRepository.php
+++ b/app/Ninja/Repositories/InvoiceRepository.php
@@ -1026,7 +1026,7 @@ class InvoiceRepository extends BaseRepository
         }
 
         // once an invoice with fee surcharge has been paid don't clear it
-        if (($location == FEE_LOCATION_CHARGE1 || $location == FEE_LOCATION_CHARGE2) && $invoice->amount != $invoice->balance) {
+        if ($account->hasGatewayFeeSurcharge() && $invoice->amount != $invoice->balance) {
             return false;
         }
 
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index f86bf20dc1b3..121d2183396d 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -2416,7 +2416,7 @@ $LANG = array(
     'online_payment_surcharge' => 'Online Payment Surcharge',
     'gateway_fees' => 'Gateway Fees',
     'fees_disabled' => 'Fees are disabled',
-    'gateway_fees_help' => 'Automatically add an online payment surcharge or line item.<br/>Use \'Line item\' to support partial/deposit payments.',
+    'gateway_fees_help' => 'Automatically add an online payment surcharge or line item.<br/>Surcharges aren\'t affected by discounts, line item supports partial payments.',
     'gateway' => 'Gateway',
     'gateway_fee_change_warning' => 'If there are unpaid invoices with fees they need to be removed to prevent duplicate fees from being charged.',
     'fees_surcharge_help' => 'Customize surcharge :link.',