diff --git a/app/Http/Controllers/EmailController.php b/app/Http/Controllers/EmailController.php
index 07acd26b721b..175011ac61f0 100644
--- a/app/Http/Controllers/EmailController.php
+++ b/app/Http/Controllers/EmailController.php
@@ -17,6 +17,7 @@ use App\Http\Middleware\UserVerified;
 use App\Http\Requests\Email\SendEmailRequest;
 use App\Jobs\Entity\EmailEntity;
 use App\Jobs\Mail\EntitySentMailer;
+use App\Jobs\PurchaseOrder\PurchaseOrderEmail;
 use App\Models\Credit;
 use App\Models\Invoice;
 use App\Models\Quote;
@@ -125,6 +126,11 @@ class EmailController extends BaseController
             'body' => $body
         ];
 
+        if($entity == 'purchaseOrder' || $template == 'purchase_order'){
+            PurchaseOrderEmail::dispatch($entity, $entity->company, $data);
+            return;
+        }
+
         $entity_obj->invitations->each(function ($invitation) use ($data, $entity_string, $entity_obj, $template) {
 
             if (!$invitation->contact->trashed() && $invitation->contact->email) {
diff --git a/app/Http/Requests/Email/SendEmailRequest.php b/app/Http/Requests/Email/SendEmailRequest.php
index d75f91dfda16..3cfcc61a9365 100644
--- a/app/Http/Requests/Email/SendEmailRequest.php
+++ b/app/Http/Requests/Email/SendEmailRequest.php
@@ -13,6 +13,7 @@ namespace App\Http\Requests\Email;
 
 use App\Http\Requests\Request;
 use App\Utils\Traits\MakesHash;
+use Illuminate\Support\Str;
 
 class SendEmailRequest extends Request
 {
@@ -60,7 +61,7 @@ class SendEmailRequest extends Request
             $input['entity_id'] = $this->decodePrimaryKey($input['entity_id']);
         
         if(array_key_exists('entity', $input))
-            $input['entity'] = "App\Models\\".ucfirst($input['entity']);
+            $input['entity'] = "App\Models\\".ucfirst(Str::camel($input['entity']));
 
         $this->replace($input);
     }
diff --git a/app/Services/PurchaseOrder/PurchaseOrderService.php b/app/Services/PurchaseOrder/PurchaseOrderService.php
index e2990b372b42..e68e5c508761 100644
--- a/app/Services/PurchaseOrder/PurchaseOrderService.php
+++ b/app/Services/PurchaseOrder/PurchaseOrderService.php
@@ -40,7 +40,7 @@ class PurchaseOrderService
 
     public function applyNumber()
     {
-        $this->invoice = (new ApplyNumber($this->purchase_order->vendor, $this->purchase_order))->run();
+        $this->purchase_order = (new ApplyNumber($this->purchase_order->vendor, $this->purchase_order))->run();
 
         return $this;
     }