diff --git a/app/Jobs/Mail/NinjaMailer.php b/app/Jobs/Mail/NinjaMailer.php
index 239b368c6b91..4ebd9a9bb5ed 100644
--- a/app/Jobs/Mail/NinjaMailer.php
+++ b/app/Jobs/Mail/NinjaMailer.php
@@ -35,7 +35,13 @@ class NinjaMailer extends Mailable
     public function build()
     {
 
-        return $this->from(config('mail.from.address'), config('mail.from.name'))
+        $from_name = config('mail.from.name');
+
+        if(property_exists($this->mail_obj, 'from_name')){
+            $from_name = $this->mail_obj->from_name;
+        }
+
+        return $this->from(config('mail.from.address'), $from_name)
                     ->subject($this->mail_obj->subject)
                     ->view($this->mail_obj->markdown, $this->mail_obj->data)
                     ->withSwiftMessage(function ($message) {
diff --git a/app/Mail/ClientContact/ClientContactResetPasswordObject.php b/app/Mail/ClientContact/ClientContactResetPasswordObject.php
index a911045ff922..fa6a0906a8f5 100644
--- a/app/Mail/ClientContact/ClientContactResetPasswordObject.php
+++ b/app/Mail/ClientContact/ClientContactResetPasswordObject.php
@@ -22,6 +22,7 @@ class ClientContactResetPasswordObject
     public $token;
 
     private $company;
+    
     /**
      *
      */
@@ -52,12 +53,19 @@ class ClientContactResetPasswordObject
             'logo' => $this->company->present()->logo(),
         ];
 
+        $email_from_name = config('mail.from.name');
+
+        if(property_exists($settings, 'email_from_name') && strlen($settings->email_from_name) > 1)
+            $email_from_name = $settings->email_from_name;
+        else
+            $email_from_name = $this->company->present()->name();
 
         $mail_obj = new \stdClass;
         $mail_obj->subject = ctrans('texts.your_password_reset_link');
         $mail_obj->data = $data;
         $mail_obj->markdown = 'email.client.generic';
         $mail_obj->tag = $this->company->company_key;
+        $mail_obj->from_name = $email_from_name;
 
         return $mail_obj;
     }