diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickCivilityType.php b/src/Bundle/ChillMainBundle/Form/Type/PickCivilityType.php
index 2bfecdfda..27e2618f1 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickCivilityType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickCivilityType.php
@@ -14,11 +14,9 @@ namespace Chill\MainBundle\Form\Type;
 use Chill\MainBundle\Entity\Civility;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\Mapping\Entity;
 use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class PickCivilityType extends AbstractType
@@ -52,6 +50,6 @@ class PickCivilityType extends AbstractType
 
     public function getParent()
     {
-        return Entity::class;
+        return EntityType::class;
     }
 }
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Form/PersonType.php b/src/Bundle/ChillPersonBundle/Form/PersonType.php
index 2664edfae..8634c253c 100644
--- a/src/Bundle/ChillPersonBundle/Form/PersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonType.php
@@ -193,6 +193,8 @@ class PersonType extends AbstractType
             $builder
                 ->add('civility', PickCivilityType::class, [
                     'required' => false,
+                    'label' => 'Civility',
+                    'placeholder' => 'choose civility'
                 ]);
         }