diff --git a/app/Ninja/Repositories/AccountRepository.php b/app/Ninja/Repositories/AccountRepository.php
index 2d79927abd..43f2de1f82 100644
--- a/app/Ninja/Repositories/AccountRepository.php
+++ b/app/Ninja/Repositories/AccountRepository.php
@@ -41,8 +41,6 @@ class AccountRepository
         $account->ip = Request::getClientIp();
         $account->account_key = str_random(RANDOM_KEY_LENGTH);
         $account->company_id = $company->id;
-        $account->invoice_taxes = false;
-        $account->invoice_item_taxes = true;
 
         // Track referal code
         if ($referralCode = Session::get(SESSION_REFERRAL_CODE)) {
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 1a6608a38e..fbefd573b1 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -2405,7 +2405,7 @@ $LANG = array(
     'fees_tax_help' => 'Enable line item taxes to set fee tax rates.',
     'fees_sample' => 'The fee for a :amount invoice would be :total.',
     'no_fees' => 'No Fees',
-    'gateway_fees_disclaimer' => 'Warning: not all payment gateways allow adding fees, please review their terms of service.',
+    'gateway_fees_disclaimer' => 'Warning: not all states/payment gateways allow adding fees, please review local laws/terms of service.',
     'percent' => 'Percent',
     'location' => 'Location',
     'line_item' => 'Line Item',
diff --git a/resources/views/accounts/invoice_settings.blade.php b/resources/views/accounts/invoice_settings.blade.php
index 2e13ec72f2..9785c0082a 100644
--- a/resources/views/accounts/invoice_settings.blade.php
+++ b/resources/views/accounts/invoice_settings.blade.php
@@ -236,12 +236,15 @@
 
                         {!! Former::text('custom_invoice_label1')
                                 ->label(trans('texts.field_label'))
+                                ->placeholder($account->gateway_fee_location == FEE_LOCATION_CHARGE1 ? trans('texts.surcharge') : ' ')
                                 ->addGroupClass('pad-checkbox')
                                 ->append(Former::checkbox('custom_invoice_taxes1')
                                 ->value(1)
                                 ->raw() . trans('texts.charge_taxes')) !!}
+
                         {!! Former::text('custom_invoice_label2')
                                 ->label(trans('texts.field_label'))
+                                ->placeholder($account->gateway_fee_location == FEE_LOCATION_CHARGE2 ? trans('texts.surcharge') : ' ')
                                 ->addGroupClass('pad-checkbox')
                                 ->append(Former::checkbox('custom_invoice_taxes2')
                                 ->value(1)
diff --git a/resources/views/accounts/payments.blade.php b/resources/views/accounts/payments.blade.php
index 3ed37dd515..5c43947f9b 100644
--- a/resources/views/accounts/payments.blade.php
+++ b/resources/views/accounts/payments.blade.php
@@ -30,8 +30,8 @@
 
 			{!! Former::select('gateway_fee_location')
 					->addOption(trans('texts.disabled'), '')
-					->addOption(trans('texts.first_surcharge') . ($account->custom_invoice_label1 ? ': ' . $account->custom_invoice_label1 : ''), FEE_LOCATION_CHARGE1)
-					->addOption(trans('texts.second_surcharge') . ($account->custom_invoice_label2 ? ': ' . $account->custom_invoice_label2 : '' ), FEE_LOCATION_CHARGE2)
+					->addOption(trans('texts.first_surcharge') . ($account->custom_invoice_label1 ? ' | ' . $account->custom_invoice_label1 : ''), FEE_LOCATION_CHARGE1)
+					->addOption(trans('texts.second_surcharge') . ($account->custom_invoice_label2 ? ' | ' . $account->custom_invoice_label2 : '' ), FEE_LOCATION_CHARGE2)
 					//->addOption(trans('texts.line_item'), FEE_LOCATION_ITEM)
 					->label('gateway_fees')!!}
 
@@ -246,6 +246,11 @@
 			$('#fee_percent').val(settings.fee_percent);
 			setTaxRate(1, settings.fee_tax_name1, settings.fee_tax_rate1);
 			setTaxRate(2, settings.fee_tax_name2, settings.fee_tax_rate2);
+		} else {
+			$('#fee_amount').val('');
+			$('#fee_percent').val('');
+			setTaxRate(1, '', '');
+			setTaxRate(2, '', '');
 		}
 
         $('#paymentLimitsModal').modal('show');