diff --git a/app/Models/Account.php b/app/Models/Account.php
index 368ecac825ab..b2d5a7d22dce 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -1023,7 +1023,7 @@ class Account extends Eloquent
         return true;
     }
 
-    public function showCustomField($field, $entity)
+    public function showCustomField($field, $entity = false)
     {
         if ($this->isPro()) {
             return $this->$field ? true : false;
diff --git a/public/built.js b/public/built.js
index 5e28b8fb3f18..9d1e0d3a3ee2 100644
--- a/public/built.js
+++ b/public/built.js
@@ -31259,10 +31259,10 @@ NINJA.invoiceColumns = function(invoice)
 
     columns.push("*")
 
-    if (account.custom_invoice_item_label1) {
+    if (invoice.is_pro && account.custom_invoice_item_label1) {
         columns.push("10%");
     }
-    if (account.custom_invoice_item_label2) {
+    if (invoice.is_pro && account.custom_invoice_item_label2) {
         columns.push("10%");
     }
 
@@ -31314,10 +31314,10 @@ NINJA.invoiceLines = function(invoice) {
 
     grid[0].push({text: invoiceLabels.description, style: ['tableHeader', 'descriptionTableHeader']});
 
-    if (account.custom_invoice_item_label1) {
+    if (invoice.is_pro && account.custom_invoice_item_label1) {
         grid[0].push({text: account.custom_invoice_item_label1, style: ['tableHeader', 'custom1TableHeader']});
     }
-    if (account.custom_invoice_item_label2) {
+    if (invoice.is_pro && account.custom_invoice_item_label2) {
         grid[0].push({text: account.custom_invoice_item_label2, style: ['tableHeader', 'custom2TableHeader']});
     }
 
@@ -31372,10 +31372,10 @@ NINJA.invoiceLines = function(invoice) {
             row.push({style:["productKey", rowStyle], text:productKey || ' '}); // product key can be blank when selecting from a datalist
         }
         row.push({style:["notes", rowStyle], stack:[{text:notes || ' '}]}); 
-        if (account.custom_invoice_item_label1) {
+        if (invoice.is_pro && account.custom_invoice_item_label1) {
             row.push({style:["customValue1", rowStyle], text:item.custom_value1 || ' '});
         }
-        if (account.custom_invoice_item_label2) {
+        if (invoice.is_pro && account.custom_invoice_item_label2) {
             row.push({style:["customValue2", rowStyle], text:item.custom_value2 || ' '});
         }
         row.push({style:["cost", rowStyle], text:cost});
diff --git a/public/js/pdf.pdfmake.js b/public/js/pdf.pdfmake.js
index 3a9f40280c74..d6e7906ca6d6 100644
--- a/public/js/pdf.pdfmake.js
+++ b/public/js/pdf.pdfmake.js
@@ -267,10 +267,10 @@ NINJA.invoiceColumns = function(invoice)
 
     columns.push("*")
 
-    if (account.custom_invoice_item_label1) {
+    if (invoice.is_pro && account.custom_invoice_item_label1) {
         columns.push("10%");
     }
-    if (account.custom_invoice_item_label2) {
+    if (invoice.is_pro && account.custom_invoice_item_label2) {
         columns.push("10%");
     }
 
@@ -322,10 +322,10 @@ NINJA.invoiceLines = function(invoice) {
 
     grid[0].push({text: invoiceLabels.description, style: ['tableHeader', 'descriptionTableHeader']});
 
-    if (account.custom_invoice_item_label1) {
+    if (invoice.is_pro && account.custom_invoice_item_label1) {
         grid[0].push({text: account.custom_invoice_item_label1, style: ['tableHeader', 'custom1TableHeader']});
     }
-    if (account.custom_invoice_item_label2) {
+    if (invoice.is_pro && account.custom_invoice_item_label2) {
         grid[0].push({text: account.custom_invoice_item_label2, style: ['tableHeader', 'custom2TableHeader']});
     }
 
@@ -380,10 +380,10 @@ NINJA.invoiceLines = function(invoice) {
             row.push({style:["productKey", rowStyle], text:productKey || ' '}); // product key can be blank when selecting from a datalist
         }
         row.push({style:["notes", rowStyle], stack:[{text:notes || ' '}]}); 
-        if (account.custom_invoice_item_label1) {
+        if (invoice.is_pro && account.custom_invoice_item_label1) {
             row.push({style:["customValue1", rowStyle], text:item.custom_value1 || ' '});
         }
-        if (account.custom_invoice_item_label2) {
+        if (invoice.is_pro && account.custom_invoice_item_label2) {
             row.push({style:["customValue2", rowStyle], text:item.custom_value2 || ' '});
         }
         row.push({style:["cost", rowStyle], text:cost});
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index ded91d7e0c90..5fa93dd3c8e3 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -191,10 +191,10 @@
 				<th style="min-width:32px;" class="hide-border"></th>
 				<th style="min-width:160px">{{ $invoiceLabels['item'] }}</th>
 				<th style="width:100%">{{ $invoiceLabels['description'] }}</th>
-                @if ($account->custom_invoice_item_label1)
+                @if ($account->showCustomField('custom_invoice_item_label1'))
                     <th style="min-width:120px">{{ $account->custom_invoice_item_label1 }}</th>
                 @endif
-                @if ($account->custom_invoice_item_label2)
+                @if ($account->showCustomField('custom_invoice_item_label2'))
                     <th style="min-width:120px">{{ $account->custom_invoice_item_label2 }}</th>
                 @endif
 				<th style="min-width:120px" data-bind="text: costLabel">{{ $invoiceLabels['unit_cost'] }}</th>
@@ -219,12 +219,12 @@
                         <input type="text" data-bind="value: task_public_id, attr: {name: 'invoice_items[' + $index() + '][task_public_id]'}" style="display: none"/>
 						<input type="text" data-bind="value: expense_public_id, attr: {name: 'invoice_items[' + $index() + '][expense_public_id]'}" style="display: none"/>
 				</td>
-                @if ($account->custom_invoice_item_label1)
+                @if ($account->showCustomField('custom_invoice_item_label1'))
                     <td>
                         <input data-bind="value: custom_value1, valueUpdate: 'afterkeydown', attr: {name: 'invoice_items[' + $index() + '][custom_value1]'}" class="form-control invoice-item"/>
                     </td>
                 @endif
-                @if ($account->custom_invoice_item_label2)
+                @if ($account->showCustomField('custom_invoice_item_label2'))
                     <td>
                         <input data-bind="value: custom_value2, valueUpdate: 'afterkeydown', attr: {name: 'invoice_items[' + $index() + '][custom_value2]'}" class="form-control invoice-item"/>
                     </td>
@@ -257,7 +257,7 @@
 		<tfoot>
 			<tr>
 				<td class="hide-border"/>
-				<td class="hide-border" colspan="{{ 2 + ($account->custom_invoice_item_label1 ? 1 : 0) + ($account->custom_invoice_item_label2 ? 1 : 0) }}" rowspan="6" style="vertical-align:top">
+				<td class="hide-border" colspan="{{ 2 + ($account->showCustomField('custom_invoice_item_label1') ? 1 : 0) + ($account->showCustomField('custom_invoice_item_label2') ? 1 : 0) }}" rowspan="6" style="vertical-align:top">
 					<br/>
                     <div role="tabpanel">