diff --git a/app/Http/Controllers/RecurringInvoiceController.php b/app/Http/Controllers/RecurringInvoiceController.php
index d09d31e80220..94c2192d178a 100644
--- a/app/Http/Controllers/RecurringInvoiceController.php
+++ b/app/Http/Controllers/RecurringInvoiceController.php
@@ -157,6 +157,7 @@ class RecurringInvoiceController extends BaseController
         $user = auth()->user();
 
         $recurring_invoice = RecurringInvoiceFactory::create($user->company()->id, $user->id);
+        $recurring_invoice->auto_bill = $user->company()->settings->auto_bill;
 
         return $this->itemResponse($recurring_invoice);
     }
diff --git a/app/Http/Livewire/TasksTable.php b/app/Http/Livewire/TasksTable.php
index 40106c390bd6..f229db889f46 100644
--- a/app/Http/Livewire/TasksTable.php
+++ b/app/Http/Livewire/TasksTable.php
@@ -39,11 +39,11 @@ class TasksTable extends Component
             ->where('is_deleted', false)
             ->where('client_id', auth()->guard('contact')->user()->client_id);
 
-        if ($this->company->getSetting('show_all_tasks_client_portal') === 'invoiced') {
+        if ( auth()->guard('contact')->user()->client->getSetting('show_all_tasks_client_portal') === 'invoiced') {
             $query = $query->whereNotNull('invoice_id');
         }
 
-        if ($this->company->getSetting('show_all_tasks_client_portal') === 'uninvoiced') {
+        if ( auth()->guard('contact')->user()->client->getSetting('show_all_tasks_client_portal') === 'uninvoiced') {
             $query = $query->whereNull('invoice_id');
         }