diff --git a/app/Jobs/Payment/EmailPayment.php b/app/Jobs/Payment/EmailPayment.php
index 283b3265b1a9..e93fc5faaf22 100644
--- a/app/Jobs/Payment/EmailPayment.php
+++ b/app/Jobs/Payment/EmailPayment.php
@@ -39,6 +39,7 @@ class EmailPayment extends BaseMailerJob implements ShouldQueue
     private $company;
 
     public $settings;
+    
     /**
      * Create a new job instance.
      *
diff --git a/app/Mail/Engine/PaymentEmailEngine.php b/app/Mail/Engine/PaymentEmailEngine.php
index e95942ce34a1..48724998d6bd 100644
--- a/app/Mail/Engine/PaymentEmailEngine.php
+++ b/app/Mail/Engine/PaymentEmailEngine.php
@@ -103,6 +103,7 @@ class PaymentEmailEngine extends BaseEmailEngine
         $data['$from'] = ['value' => '', 'label' => ctrans('texts.from')];
         $data['$to'] = ['value' => '', 'label' => ctrans('texts.to')];
         $data['$number'] = ['value' => $this->payment->number ?: ' ', 'label' => ctrans('texts.payment_number')];
+        $data['$payment.number'] = &$data['$number'];
         $data['$entity'] = ['value' => '', 'label' => ctrans('texts.payment')];
         $data['$payment.amount'] = ['value' => Number::formatMoney($this->payment->amount, $this->client) ?: ' ', 'label' => ctrans('texts.amount')];
         $data['$amount'] = &$data['$payment.amount'];
diff --git a/app/Services/Invoice/MarkPaid.php b/app/Services/Invoice/MarkPaid.php
index 1fe1d0deed01..63aee8f49ee4 100644
--- a/app/Services/Invoice/MarkPaid.php
+++ b/app/Services/Invoice/MarkPaid.php
@@ -14,6 +14,7 @@ namespace App\Services\Invoice;
 use App\Events\Invoice\InvoiceWasPaid;
 use App\Events\Payment\PaymentWasCreated;
 use App\Factory\PaymentFactory;
+use App\Jobs\Payment\EmailPayment;
 use App\Models\Invoice;
 use App\Models\Payment;
 use App\Services\AbstractService;
@@ -74,6 +75,8 @@ class MarkPaid extends AbstractService
                 ->applyNumber()
                 ->save();
 
+        EmailPayment::dispatch($payment, $payment->company, $payment->client->primary_contact()->first());
+        
         /* Update Invoice balance */
         event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars()));
         event(new InvoiceWasPaid($this->invoice, $payment->company, Ninja::eventVars()));