diff --git a/Form/Handler/EmailFormHandler.php b/Form/Handler/EmailFormHandler.php
index 2298d7e..f7e61fd 100644
--- a/Form/Handler/EmailFormHandler.php
+++ b/Form/Handler/EmailFormHandler.php
@@ -88,7 +88,7 @@ public function processForm(FormInterface $form, Request $request)
         $valid = false;
         $form->handleRequest($request);
 
-        if ($form->isValid()) {
+        if ($form->isSubmitted() && $form->isValid()) {
             $model = $form->getData();
             $model->getEntity()->addTranslation($model->getTranslation());
 
diff --git a/Form/Handler/LayoutFormHandler.php b/Form/Handler/LayoutFormHandler.php
index 70b5dac..d9495fd 100644
--- a/Form/Handler/LayoutFormHandler.php
+++ b/Form/Handler/LayoutFormHandler.php
@@ -88,7 +88,7 @@ public function processForm(FormInterface $form, Request $request)
         $valid = false;
         $form->handleRequest($request);
 
-        if ($form->isValid()) {
+        if ($form->isSubmitted() && $form->isValid()) {
             $model = $form->getData();
             $model->getEntity()->addTranslation($model->getTranslation());
 
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
index 4931a6d..20e8c2d 100644
--- a/Resources/config/services.xml
+++ b/Resources/config/services.xml
@@ -37,6 +37,9 @@
     </parameters>
 
     <services>
+
+        <defaults public="true" />
+
         <service id="lexik_mailer.doctrine.metadata_listener" class="Lexik\Bundle\MailerBundle\Doctrine\MetadataListener">
             <tag name="doctrine.event_listener" event="loadClassMetadata" />
         </service>