diff --git a/app/Models/Company.php b/app/Models/Company.php
index 98e10abf485b..b7bc9676f614 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -69,6 +69,7 @@ class Company extends BaseModel
     protected $presenter = \App\Models\Presenters\CompanyPresenter::class;
 
     protected $fillable = [
+        'show_tasks_table',
         'mark_expenses_invoiceable',
         'mark_expenses_paid',
         'enabled_item_tax_rates',
diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php
index 1af4d6dfa8c5..cb3df61e8317 100644
--- a/app/Transformers/CompanyTransformer.php
+++ b/app/Transformers/CompanyTransformer.php
@@ -154,7 +154,7 @@ class CompanyTransformer extends EntityTransformer
             'invoice_task_timelog' => (bool) $company->invoice_task_timelog,
             'auto_start_tasks' => (bool) $company->auto_start_tasks,
             'invoice_task_documents' => (bool) $company->invoice_task_documents,
-            // 'use_credits_payment' => 'always', //todo remove
+            'use_credits_payment' => 'always', //todo remove
         ];
     }
 
diff --git a/app/Utils/TemplateEngine.php b/app/Utils/TemplateEngine.php
index 1bf85b519cb1..f83e917fb0db 100644
--- a/app/Utils/TemplateEngine.php
+++ b/app/Utils/TemplateEngine.php
@@ -16,6 +16,7 @@ use App\Models\Client;
 use App\Models\ClientContact;
 use App\Models\Invoice;
 use App\Models\InvoiceInvitation;
+use App\Utils\HtmlEngine;
 use App\Utils\Traits\MakesHash;
 use App\Utils\Traits\MakesInvoiceHtml;
 use App\Utils\Traits\MakesTemplateData;
@@ -151,7 +152,9 @@ class TemplateEngine
 
     private function entityValues($contact)
     {
-        $data = $this->entity_obj->buildLabelsAndValues($contact);
+        //$data = $this->entity_obj->buildLabelsAndValues($contact);
+
+        $data = (new HtmlEngine($this->entity_obj->invitations->first()))->generateLabelsAndValues();
         // $arrKeysLength = array_map('strlen', array_keys($data));
         // array_multisort($arrKeysLength, SORT_DESC, $data);
 
diff --git a/database/migrations/2020_10_27_021751_tasks_invoice_documents.php b/database/migrations/2020_10_27_021751_tasks_invoice_documents.php
index 653b74342e7f..3bb2c8ddd366 100644
--- a/database/migrations/2020_10_27_021751_tasks_invoice_documents.php
+++ b/database/migrations/2020_10_27_021751_tasks_invoice_documents.php
@@ -16,6 +16,11 @@ class TasksInvoiceDocuments extends Migration
         Schema::table('tasks', function(Blueprint $table){
             $table->boolean('invoice_documents')->default(0);
         });
+
+        Schema::table('companies', function(Blueprint $table){
+            $table->boolean('show_tasks_table')->default();
+        });
+
     }
 
     /**