diff --git a/app/Export/CSV/BaseExport.php b/app/Export/CSV/BaseExport.php
index a05e61e7b1..55b931550c 100644
--- a/app/Export/CSV/BaseExport.php
+++ b/app/Export/CSV/BaseExport.php
@@ -628,11 +628,11 @@ class BaseExport
         }
         
         if(in_array($column, ['client.user_id', 'user_id'])) {
-            return $entity->client->user->present()->name();
+            return $entity->client->user ? $entity->client->user->present()->name() : '';
         }
 
         if(in_array($column, ['client.assigned_user_id', 'assigned_user_id'])) {
-            return $entity->client->assigned_user->present()->name();
+            return $entity->client->assigned_user ? $entity->client->assigned_user->present()->name() : '';
         }
 
         if(in_array($column, ['client.country_id', 'country_id'])) {
@@ -760,7 +760,7 @@ class BaseExport
                 return $transformed_payment[$column];
             } elseif (array_key_exists(str_replace("payment.", "", $column), $transformed_payment)) {
                 return $transformed_payment[$column];
-            }
+            } 
 
             // nlog("export: Could not resolve payment key: {$column}");
 
diff --git a/app/Export/CSV/PaymentExport.php b/app/Export/CSV/PaymentExport.php
index 48f996fae7..c92fc5983f 100644
--- a/app/Export/CSV/PaymentExport.php
+++ b/app/Export/CSV/PaymentExport.php
@@ -167,6 +167,14 @@ class PaymentExport extends BaseExport
             $entity['gateway'] = $payment->gateway_type ? $payment->gateway_type->name : 'Unknown Type';
         }
 
+        if (in_array('payment.assigned_user_id', $this->input['report_keys'])) {
+            $entity['payment.assigned_user_id'] = $payment->assigned_user ? $payment->assigned_user->present()->name() : '';
+        }
+
+        if (in_array('payment.user_id', $this->input['report_keys'])) {
+            $entity['payment.user_id'] = $payment->user ? $payment->user->present()->name() : '';
+        }
+
         // $entity['invoices'] = $payment->invoices()->exists() ? $payment->invoices->pluck('number')->implode(',') : '';
 
         return $entity;
diff --git a/app/Export/CSV/RecurringInvoiceExport.php b/app/Export/CSV/RecurringInvoiceExport.php
index 02e51cac03..18bf306a03 100644
--- a/app/Export/CSV/RecurringInvoiceExport.php
+++ b/app/Export/CSV/RecurringInvoiceExport.php
@@ -157,6 +157,15 @@ class RecurringInvoiceExport extends BaseExport
             $entity['recurring_invoice.auto_bill_enabled'] = $invoice->auto_bill_enabled ? ctrans('texts.yes') : ctrans('texts.no');
         }
 
+        if (in_array('recurring_invoice.assigned_user_id', $this->input['report_keys'])) {
+            $entity['recurring_invoice.assigned_user_id'] = $invoice->assigned_user ? $invoice->assigned_user->present()->name() : '';
+        }
+
+        if (in_array('recurring_invoice.user_id', $this->input['report_keys'])) {
+            $entity['recurring_invoice.user_id'] = $invoice->user ? $invoice->user->present()->name() : '';
+        }
+
+
         return $entity;
     }
 }
diff --git a/app/Export/Decorators/ClientDecorator.php b/app/Export/Decorators/ClientDecorator.php
new file mode 100644
index 0000000000..83fbdad948
--- /dev/null
+++ b/app/Export/Decorators/ClientDecorator.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Export\Decorators;
+
+class ClientDecorator implements DecoratorInterface
+{
+    public function transform(): string
+    {
+        return 'Payment Decorator';
+    }
+}
diff --git a/app/Export/Decorators/CreditDecorator.php b/app/Export/Decorators/CreditDecorator.php
new file mode 100644
index 0000000000..41648b9b88
--- /dev/null
+++ b/app/Export/Decorators/CreditDecorator.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Export\Decorators;
+
+class CreditDecorator implements DecoratorInterface
+{
+    public function transform(): string
+    {
+        return 'Payment Decorator';
+    }
+}
diff --git a/app/Export/Decorators/Decorator.php b/app/Export/Decorators/Decorator.php
new file mode 100644
index 0000000000..0a55e60ed1
--- /dev/null
+++ b/app/Export/Decorators/Decorator.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Export\Decorators;
+
+
+use App\Models\Task;
+use App\Models\Quote;
+use App\Models\Client;
+use App\Models\Credit;
+use App\Models\Vendor;
+use App\Models\Expense;
+use App\Models\Invoice;
+use App\Models\Payment;
+use App\Models\Product;
+use App\Models\Project;
+use App\Models\PurchaseOrder;
+use App\Models\RecurringInvoice;
+
+class Decorator {
+
+    public function __invoke(mixed $entity, string $key)
+    {
+        return match($entity){
+            ($entity instanceof Client) => $value = (new ClientDecorator($entity, $key))->transform(),
+            ($entity instanceof Payment) => $value = (new PaymentDecorator($entity, $key))->transform(),
+            ($entity instanceof Invoice) => $value = (new InvoiceDecorator($entity, $key))->transform(),
+            ($entity instanceof RecurringInvoice) => $value = (new RecurringInvoiceDecorator($entity, $key))->transform(),
+            ($entity instanceof Credit) => $value = (new CreditDecorator($entity, $key))->transform(),
+            ($entity instanceof Quote) => $value = (new QuoteDecorator($entity, $key))->transform(),
+            ($entity instanceof Task) => $value = (new TaskDecorator($entity, $key))->transform(),
+            ($entity instanceof Expense) => $value = (new ExpenseDecorator($entity, $key))->transform(),
+            ($entity instanceof Project) => $value = (new ProjectDecorator($entity, $key))->transform(),
+            ($entity instanceof Product) => $value = (new ProductDecorator($entity, $key))->transform(),
+            ($entity instanceof Vendor) => $value = (new VendorDecorator($entity, $key))->transform(),
+            ($entity instanceof PurchaseOrder) => $value = (new PurchaseOrderDecorator($entity, $key))->transform(),
+            default => $value = '',
+        };
+
+        return $value;
+    }
+
+}
diff --git a/app/Export/Decorators/DecoratorInterface.php b/app/Export/Decorators/DecoratorInterface.php
new file mode 100644
index 0000000000..a19b231f8f
--- /dev/null
+++ b/app/Export/Decorators/DecoratorInterface.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Export\Decorators;
+
+interface DecoratorInterface {
+    public function transform(): string;
+}
diff --git a/app/Export/Decorators/ExpenseDecorator.php b/app/Export/Decorators/ExpenseDecorator.php
new file mode 100644
index 0000000000..828d28690e
--- /dev/null
+++ b/app/Export/Decorators/ExpenseDecorator.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Export\Decorators;
+
+class ExpenseDecorator implements DecoratorInterface
+{
+    public function transform(): string
+    {
+        return 'Payment Decorator';
+    }
+}
diff --git a/app/Export/Decorators/InvoiceDecorator.php b/app/Export/Decorators/InvoiceDecorator.php
new file mode 100644
index 0000000000..2898965c7a
--- /dev/null
+++ b/app/Export/Decorators/InvoiceDecorator.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Export\Decorators;
+
+class InvoiceDecorator implements DecoratorInterface
+{
+    public function transform(): string
+    {
+        return 'Payment Decorator';
+    }
+}
diff --git a/app/Export/Decorators/PaymentDecorator.php b/app/Export/Decorators/PaymentDecorator.php
new file mode 100644
index 0000000000..9a287d4a08
--- /dev/null
+++ b/app/Export/Decorators/PaymentDecorator.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Export\Decorators;
+
+class PaymentDecorator implements DecoratorInterface{
+
+    public function transform(): string
+    {
+        return 'Payment Decorator';
+    }
+}
\ No newline at end of file
diff --git a/app/Export/Decorators/ProductDecorator.php b/app/Export/Decorators/ProductDecorator.php
new file mode 100644
index 0000000000..b22d940fbe
--- /dev/null
+++ b/app/Export/Decorators/ProductDecorator.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Export\Decorators;
+
+class ProductDecorator implements DecoratorInterface
+{
+    public function transform(): string
+    {
+        return 'Payment Decorator';
+    }
+}
diff --git a/app/Export/Decorators/ProjectDecorator.php b/app/Export/Decorators/ProjectDecorator.php
new file mode 100644
index 0000000000..62b5d8ee91
--- /dev/null
+++ b/app/Export/Decorators/ProjectDecorator.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Export\Decorators;
+
+class ProjectDecorator implements DecoratorInterface
+{
+    public function transform(): string
+    {
+        return 'Payment Decorator';
+    }
+}
diff --git a/app/Export/Decorators/PurchaseOrderDecorator.php b/app/Export/Decorators/PurchaseOrderDecorator.php
new file mode 100644
index 0000000000..c5d8dd3a34
--- /dev/null
+++ b/app/Export/Decorators/PurchaseOrderDecorator.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Export\Decorators;
+
+class PurchaseOrderDecorator implements DecoratorInterface
+{
+    public function transform(): string
+    {
+        return 'Payment Decorator';
+    }
+}
diff --git a/app/Export/Decorators/QuoteDecorator.php b/app/Export/Decorators/QuoteDecorator.php
new file mode 100644
index 0000000000..96161c96d4
--- /dev/null
+++ b/app/Export/Decorators/QuoteDecorator.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Export\Decorators;
+
+class QuoteDecorator implements DecoratorInterface
+{
+    public function transform(): string
+    {
+        return 'Payment Decorator';
+    }
+}
diff --git a/app/Export/Decorators/RecurringInvoiceDecorator.php b/app/Export/Decorators/RecurringInvoiceDecorator.php
new file mode 100644
index 0000000000..d14e6f705e
--- /dev/null
+++ b/app/Export/Decorators/RecurringInvoiceDecorator.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Export\Decorators;
+
+class RecurringInvoiceDecorator implements DecoratorInterface
+{
+    public function transform(): string
+    {
+        return 'Payment Decorator';
+    }
+}
diff --git a/app/Export/Decorators/TaskDecorator.php b/app/Export/Decorators/TaskDecorator.php
new file mode 100644
index 0000000000..60005ad59a
--- /dev/null
+++ b/app/Export/Decorators/TaskDecorator.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Export\Decorators;
+
+class TaskDecorator implements DecoratorInterface
+{
+    public function transform(): string
+    {
+        return 'Payment Decorator';
+    }
+}
diff --git a/app/Export/Decorators/VendorDecorator.php b/app/Export/Decorators/VendorDecorator.php
new file mode 100644
index 0000000000..2dc22177a5
--- /dev/null
+++ b/app/Export/Decorators/VendorDecorator.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Export\Decorators;
+
+class VendorDecorator implements DecoratorInterface
+{
+    public function transform(): string
+    {
+        return 'Payment Decorator';
+    }
+}
diff --git a/app/Jobs/Payment/EmailRefundPayment.php b/app/Jobs/Payment/EmailRefundPayment.php
index 1ec374ab1b..f59d1e87c8 100644
--- a/app/Jobs/Payment/EmailRefundPayment.php
+++ b/app/Jobs/Payment/EmailRefundPayment.php
@@ -96,8 +96,6 @@ class EmailRefundPayment implements ShouldQueue
                 }
             }
 
-
-           
             $nmo->mailable = new TemplateEmail($email_builder, $this->contact, $invitation);
             $nmo->to_user = $this->contact;
             $nmo->settings = $this->settings;
diff --git a/app/Services/Template/TemplateService.php b/app/Services/Template/TemplateService.php
index f42508fccd..e233557f0d 100644
--- a/app/Services/Template/TemplateService.php
+++ b/app/Services/Template/TemplateService.php
@@ -121,7 +121,7 @@ class TemplateService
      * @return self
      */
     public function build(array $data): self
-    {nlog($data);
+    {
         $this->compose()
              ->processData($data)
              ->parseNinjaBlocks()
@@ -215,7 +215,7 @@ class TemplateService
     {
 
         $this->data = $this->preProcessDataBlocks($data);
-        // nlog($this->data);
+        nlog($this->data);
         return $this;
     }
 
@@ -617,7 +617,7 @@ class TemplateService
             'paymentables' => $pivot,
             'refund_activity' => $this->getPaymentRefundActivity($payment),
         ];
-
+nlog($data);
         return $data;
 
     }
@@ -827,11 +827,11 @@ class TemplateService
      */
     public function processPayments($payments): array
     {
-
+nlog("processing payments");
         $payments = collect($payments)->map(function ($payment) {
             return $this->transformPayment($payment);
         })->toArray();
-
+nlog($payments);
         return $payments;
 
     }