diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Action/OrderMailConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Action/OrderMailConfigurationType.php
index 87efc8cd85..b845034826 100644
--- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Action/OrderMailConfigurationType.php
+++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Action/OrderMailConfigurationType.php
@@ -12,10 +12,12 @@
 
 namespace CoreShop\Bundle\CoreBundle\Form\Type\Notification\Action;
 
+use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\FormBuilderInterface;
 
-class OrderMailConfigurationType extends StoreMailConfigurationType
+class OrderMailConfigurationType extends AbstractType
 {
     /**
      * {@inheritdoc}
@@ -25,9 +27,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         parent::buildForm($builder, $options);
 
         $builder
+            ->add('mails', CollectionType::class, [
+                'allow_add' => true,
+                'allow_delete' => true,
+            ])
             ->add('sendInvoices', CheckboxType::class)
             ->add('sendShipments', CheckboxType::class)
-            ->add('doNotSendToDesignatedRecipient', CheckboxType::class);
+            ->add('doNotSendToDesignatedRecipient', CheckboxType::class)
+        ;
     }
 
     /**
diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Action/StoreMailConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Action/StoreMailConfigurationType.php
index 1ead477c29..edd9bef755 100644
--- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Action/StoreMailConfigurationType.php
+++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Action/StoreMailConfigurationType.php
@@ -36,6 +36,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'entry_type' => NumberType::class,
                 ],
             ])
+            ->add('sendInvoices', CheckboxType::class)
+            ->add('sendShipments', CheckboxType::class)
             ->add('doNotSendToDesignatedRecipient', CheckboxType::class);
     }