diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 121d2183396d..b03f46a951d0 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -2420,7 +2420,8 @@ $LANG = array(
     '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.',
-    'label_and_taxes' => 'label and taxes'
+    'label_and_taxes' => 'label and taxes',
+    'billable' => 'Billable',
 
 );
 
diff --git a/resources/views/expenses/edit.blade.php b/resources/views/expenses/edit.blade.php
index 689150795558..138cc7dd309d 100644
--- a/resources/views/expenses/edit.blade.php
+++ b/resources/views/expenses/edit.blade.php
@@ -78,8 +78,8 @@
 
                     @if (!$expense || ($expense && !$expense->invoice_id && !$expense->client_id))
                         {!! Former::checkbox('should_be_invoiced')
-                                ->text(trans('texts.should_be_invoiced'))
-                                ->data_bind('checked: should_be_invoiced() || client_id(), enable: !client_id()')
+                                ->text(trans('texts.billable'))
+                                ->data_bind('checked: should_be_invoiced')
                                 ->label(' ')
                                 ->value(1) !!}
                     @endif
diff --git a/tests/acceptance/TaxRatesCest.php b/tests/acceptance/TaxRatesCest.php
index 80350f70f333..f7bdcef69c62 100644
--- a/tests/acceptance/TaxRatesCest.php
+++ b/tests/acceptance/TaxRatesCest.php
@@ -63,7 +63,7 @@ class TaxRatesCest
         $I->selectDropdown($I, $clientEmail, '.client_select .dropdown-toggle');
         $I->fillField('table.invoice-table tbody tr:nth-child(1) #product_key', $productKey);
         $I->click('table.invoice-table tbody tr:nth-child(1) .tt-selectable');
-        $I->selectOption('#taxRateSelect1', $invoiceTaxName . ' ' . $invoiceTaxRate . '%');
+        $I->selectOption('#taxRateSelect1', $invoiceTaxName . ' ' . floatval($invoiceTaxRate) . '%');
         $I->wait(3);
 
         // check total is right before saving