diff --git a/Classes/Command/SendMailCommandController.php b/Classes/Command/SendMailCommandController.php
index b158db3ad1f5a909430a29903e388a713833912a..2df3ada8ce46241448ce5ece7adc7ee846a95109 100644
--- a/Classes/Command/SendMailCommandController.php
+++ b/Classes/Command/SendMailCommandController.php
@@ -71,7 +71,7 @@ class SendMailCommandController extends CommandController {
 			}
 
 			$mailMessage = $this->objectManager->get(MailMessage::class);
-			$mailMessage->setFrom($fromAddress);
+			$mailMessage->setFrom($fromAddress, $mailToSend->getFromName());
 			$mailMessage->setTo($toAddress);
 			$mailMessage->setSubject($mailSubject);
 			if (count($ccAddresses)) {
diff --git a/Classes/Service/MailTemplateService.php b/Classes/Service/MailTemplateService.php
index 654a3e740f1dec6e7bb30b597e4a74a6ef07dbe5..0c716e4fb77000b16472c43ce9c977f9a3dd928a 100644
--- a/Classes/Service/MailTemplateService.php
+++ b/Classes/Service/MailTemplateService.php
@@ -181,7 +181,6 @@ class MailTemplateService {
 			}
 		}
 
-		$this->mailMessage->setFrom($this->fromAddress);
 		if (count($this->bccAddresses) > 0) {
 			$this->mailMessage->setBcc($this->bccAddresses);
 		}