diff --git a/app/Mail/BouncedEmail.php b/app/Mail/BouncedEmail.php
index dad747252f29..a66dae50411d 100644
--- a/app/Mail/BouncedEmail.php
+++ b/app/Mail/BouncedEmail.php
@@ -50,21 +50,5 @@ class BouncedEmail extends Mailable
                 ->text()
                 ->subject($subject);
 
-        //todo
-/*
-
-
-            //todo determine WHO is notified!! In this instance the _user_ is notified
-
-            Mail::to($invitation->user->email)
-            //->cc('')
-            //->bcc('')
-            ->queue(new BouncedEmail($invitation));
-
-        return $this->from('x@gmail.com') //todo
-            ->subject(ctrans('texts.confirmation_subject'))
-            ->markdown('email.auth.verify', ['user' => $this->user])
-            ->text('email.auth.verify_text');
-*/
     }
 }
diff --git a/app/Mail/TemplateEmail.php b/app/Mail/TemplateEmail.php
index 76c5b33732fb..aec7c51fa3e2 100644
--- a/app/Mail/TemplateEmail.php
+++ b/app/Mail/TemplateEmail.php
@@ -27,6 +27,8 @@ class TemplateEmail extends Mailable
 
     private $contact;
 
+    private $company;
+
     public function __construct($build_email, ClientContact $contact)
     {
         $this->build_email = $build_email;
@@ -34,6 +36,8 @@ class TemplateEmail extends Mailable
         $this->contact = $contact;
 
         $this->client = $contact->client;
+
+        $this->company = $contact->company;
     }
 
     public function build()
@@ -44,7 +48,7 @@ class TemplateEmail extends Mailable
 
         $company = $this->client->company;
 
-        $this->from(config('mail.from.address'), config('mail.from.name'));
+        $this->from(config('mail.from.address'), $this->company->present()->name());
 
         if (strlen($settings->reply_to_email) > 1) {
             $this->replyTo($settings->reply_to_email, $settings->reply_to_email);