diff --git a/app/components/modals/tax-info-modal.js b/app/components/modals/tax-info-modal.js
index 6352a7909b9..143f014c17d 100644
--- a/app/components/modals/tax-info-modal.js
+++ b/app/components/modals/tax-info-modal.js
@@ -52,6 +52,7 @@ export default ModalBase.extend(FormMixin, {
         },
         taxInvoiceCompany: {
           identifier : 'tax_invoice_company',
+          optional   : true,
           depends    : 'send_tax_invoices',
           rules      : [
             {
@@ -62,6 +63,7 @@ export default ModalBase.extend(FormMixin, {
         },
         taxInvoiceAddress: {
           identifier : 'tax_invoice_address',
+          optional   : true,
           depends    : 'send_tax_invoices',
           rules      : [
             {
@@ -73,6 +75,7 @@ export default ModalBase.extend(FormMixin, {
 
         taxInvoiceCity: {
           identifier : 'tax_invoice_city',
+          optional   : true,
           rules      : [
             {
               type   : 'empty',
@@ -83,6 +86,7 @@ export default ModalBase.extend(FormMixin, {
 
         taxInvoiceState: {
           identifier : 'tax_invoice_state',
+          optional   : true,
           rules      : [
             {
               type   : 'empty',
@@ -93,6 +97,7 @@ export default ModalBase.extend(FormMixin, {
 
         taxInvoiceZipCode: {
           identifier : 'tax_invoice_zipcode',
+          optional   : true,
           rules      : [
             {
               type   : 'empty',
diff --git a/app/templates/components/modals/tax-info-modal.hbs b/app/templates/components/modals/tax-info-modal.hbs
index 3c8ac219541..5ab7aa98abd 100644
--- a/app/templates/components/modals/tax-info-modal.hbs
+++ b/app/templates/components/modals/tax-info-modal.hbs
@@ -45,23 +45,23 @@
       </div>
     </div>
     <div class="field">
-      <label class="required">{{t 'Registered Company'}}</label>
+      <label>{{t 'Registered Company'}}</label>
       {{input type='text' id='tax_invoice_company' value=tax.registeredCompany}}
     </div>
     <div class="field">
-      <label class="required">{{t 'Business Address'}}</label>
+      <label>{{t 'Business Address'}}</label>
       {{textarea rows=3 id='tax_invoice_address' value=tax.address}}
     </div>
     <div class="field">
-      <label class="required">{{t 'City'}}</label>
+      <label>{{t 'City'}}</label>
       {{input type='text' id='tax_invoice_city' value=tax.city}}
     </div>
     <div class="field">
-      <label class="required">{{t 'State'}}</label>
+      <label>{{t 'State'}}</label>
       {{input type='text' id='tax_invoice_state' value=tax.state}}
     </div>
     <div class="field">
-      <label class="required">{{t 'Zipcode'}}</label>
+      <label>{{t 'Zipcode'}}</label>
       {{input type='text' id='tax_invoice_zipcode' value=tax.zip}}
     </div>
     <div class="field">