diff --git a/Classes/Service/BackendService.php b/Classes/Service/BackendService.php
index 36bfe04b336c4e0d9cc18fca783fbfb29de920c6..1e2eb853f905d3bbc727ef8ac5556f18391f25bd 100644
--- a/Classes/Service/BackendService.php
+++ b/Classes/Service/BackendService.php
@@ -293,6 +293,7 @@ class BackendService {
 		$template->setCc($templateData['cc']);
 		$template->setBcc($templateData['bcc']);
 		$template->setReplyTo($templateData['replyTo']);
+		$template->setToAddress($templateData['toAddress']);
 
 		if ($templateAlreadyExists) {
 			$templateRepository->update($template);
diff --git a/Classes/Service/MailTemplateService.php b/Classes/Service/MailTemplateService.php
index 000fa1e1ccaf64d69416f7056e583b07733d18f2..45024988cc3216591965e8abb2f8bc8b612ec8d5 100644
--- a/Classes/Service/MailTemplateService.php
+++ b/Classes/Service/MailTemplateService.php
@@ -346,6 +346,8 @@ class MailTemplateService {
 					return FALSE;
 				}
 			}
+		} elseif (filter_var($template->getToAddress(), FILTER_VALIDATE_EMAIL)) {
+		    $this->setToAddresses($template->getToAddress());
 		}
 
 		if ($isPreview) {