diff --git a/Controller/EventController.php b/Controller/EventController.php
index cb2301e6d..1885a26ae 100644
--- a/Controller/EventController.php
+++ b/Controller/EventController.php
@@ -68,7 +68,7 @@ class EventController extends Controller
             'method' => 'POST'
         ));
 
-        $form->add('submit', 'submit', array('label' => 'Create'));
+        $form->add('submit', SubmitType::class, array('label' => 'Create'));
 
         return $form;
     }
diff --git a/Form/EventType.php b/Form/EventType.php
index 2d4895efa..fe365fbe6 100644
--- a/Form/EventType.php
+++ b/Form/EventType.php
@@ -3,6 +3,7 @@
 namespace Chill\EventBundle\Form;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Chill\EventBundle\Form\Type\PickEventType;
@@ -68,10 +69,7 @@ class EventType extends AbstractType
                 
         $builder
             ->add('name')
-            ->add(
-                'date',
-                'date',
-                array(
+            ->add('date', DateType::class, array(
                     'required' => true,
                     'widget' => 'single_text',
                     'format' => 'dd-MM-yyyy'