diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index 51b46be8..93b0c161 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -284,7 +284,7 @@ class ThzController extends BaseController
         
         $assignee_email = $this->findAssigneeEmail($assignee_id) ?? '';
 
-        $sender_mail    =  $data['notes_by'] == "User" ? $user_email        : $assignee_email ;
+        $sender_mail     =  $data['notes_by'] == "User" ? $user_email        : $assignee_email ;
         $receiver_mail   =  $data['notes_by'] == "User" ? $assignee_email    : $user_email ;
 
         $templateName   = "ticket_conversation_save_notification";
@@ -311,7 +311,7 @@ class ThzController extends BaseController
     }
 
     private function findAssigneeId($ticketId){
-        $row = $this->userModel->where('thz_id', $ticketId)->get()->getRow();
+        $row = $this->thzMasterModel->where('thz_id', $ticketId)->get()->getRow();
         $assigneeId = $row ? $row->assign_to : null;
         return $assigneeId ? $assigneeId : 0 ;
     }