diff --git a/lib/Form/Templates/Template.php b/lib/Form/Templates/Template.php
index ec6443dfbf..006ca936e3 100644
--- a/lib/Form/Templates/Template.php
+++ b/lib/Form/Templates/Template.php
@@ -2,6 +2,8 @@
 
 namespace MailPoet\Form\Templates;
 
+use MailPoet\Entities\FormEntity;
+
 abstract class Template {
   abstract public function getName(): string;
 
@@ -91,4 +93,12 @@ abstract class Template {
 }
 EOL;
   }
+
+  public function toFormEntity(): FormEntity {
+    $formEntity = new FormEntity($this->getName());
+    $formEntity->setBody($this->getBody());
+    $formEntity->setSettings($this->getSettings());
+    $formEntity->setStyles($this->getStyles());
+    return $formEntity;
+  }
 }
diff --git a/lib/Form/Templates/TemplateRepository.php b/lib/Form/Templates/TemplateRepository.php
index 30f5a74eba..ab6223b5cb 100644
--- a/lib/Form/Templates/TemplateRepository.php
+++ b/lib/Form/Templates/TemplateRepository.php
@@ -25,11 +25,7 @@ class TemplateRepository {
     }
     /** @var Template $template */
     $template = new $this->templates[$templateId]();
-    $formEntity = new FormEntity($template->getName());
-    $formEntity->setBody($template->getBody());
-    $formEntity->setSettings($template->getSettings());
-    $formEntity->setStyles($template->getStyles());
-    return $formEntity;
+    return $template->toFormEntity();
   }
 
   /**