diff --git a/app/Models/Traits/PresentsInvoice.php b/app/Models/Traits/PresentsInvoice.php
index c800141dda21..33fa5bc88184 100644
--- a/app/Models/Traits/PresentsInvoice.php
+++ b/app/Models/Traits/PresentsInvoice.php
@@ -329,8 +329,6 @@ trait PresentsInvoice
             'service',
             'product_key',
             'unit_cost',
-            'tax1',
-            'tax2',
             'custom_value1',
             'custom_value2',
         ];
diff --git a/resources/views/accounts/invoice_design.blade.php b/resources/views/accounts/invoice_design.blade.php
index cffac1f44e76..85ea91bcf352 100644
--- a/resources/views/accounts/invoice_design.blade.php
+++ b/resources/views/accounts/invoice_design.blade.php
@@ -254,7 +254,7 @@
 						  <div class="pull-right" style="padding-right:14px">
                               {!! Button::normal(trans('texts.reset'))->small()
                                     ->withAttributes(['onclick' => 'sweetConfirm(function() {
-                                        resetFields();
+                                        resetInvoiceFields();
                                     })']) !!}
                           </div>
                       </div>
@@ -273,7 +273,7 @@
   						    <div class="pull-right" style="padding-right:14px">
                                 {!! Button::normal(trans('texts.reset'))->small()
                                       ->withAttributes(['onclick' => 'sweetConfirm(function() {
-                                          resetFields();
+                                          resetProductFields();
                                       })']) !!}
                             </div>
                         </div>
diff --git a/resources/views/accounts/partials/invoice_fields.blade.php b/resources/views/accounts/partials/invoice_fields.blade.php
index 9db90dacd11d..e51a080f3ed6 100644
--- a/resources/views/accounts/partials/invoice_fields.blade.php
+++ b/resources/views/accounts/partials/invoice_fields.blade.php
@@ -17,11 +17,14 @@ function ViewModel(data) {
         }
     }
 
-    self.resetFields = function() {
+    self.resetInvoiceFields = function() {
         self.invoice_fields.removeAll();
         self.client_fields.removeAll();
         self.account_fields1.removeAll();
         self.account_fields2.removeAll();
+    }
+
+    self.resetProductFields = function() {
         self.product_fields.removeAll();
         self.task_fields.removeAll();
     }
@@ -113,10 +116,17 @@ $(function() {
     ko.applyBindings(model);
 })
 
-function resetFields() {
+function resetInvoiceFields() {
     var defaultFields = {!! json_encode($account->getDefaultInvoiceFields()) !!};
-    window.model.resetFields();
-    loadFields(defaultFields);
+    window.model.resetInvoiceFields();
+    loadFields(defaultFields, 'invoice');
+    window.model.onChange();
+}
+
+function resetProductFields() {
+    var defaultFields = {!! json_encode($account->getDefaultInvoiceFields()) !!};
+    window.model.resetProductFields();
+    loadFields(defaultFields, 'product');
     window.model.onChange();
 }
 
@@ -136,12 +146,18 @@ function loadMap(allFields) {
     }
 }
 
-function loadFields(selectedFields)
-{
+function loadFields(selectedFields, filter) {
     for (var section in selectedFields) {
         if ( ! selectedFields.hasOwnProperty(section)) {
             continue;
         }
+
+        if (filter == 'invoice' && (section == 'product_fields' || section == 'task_fields')) {
+            continue;
+        } else if (filter == 'product' && (section != 'product_fields' && section != 'task_fields')) {
+            continue;
+        }
+
         var fields = selectedFields[section];
         for (var field in fields) {
             if ( ! fields.hasOwnProperty(field)) {