diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php
index febc57a17..b7e9ff56e 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php
@@ -11,13 +11,12 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Filter\SocialWorkFilters;
 
-use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use Chill\MainBundle\Templating\Entity\UserRender;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use function in_array;
 
@@ -61,13 +60,8 @@ class ReferrerFilter implements FilterInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('accepted_agents', EntityType::class, [
-            'class' => User::class,
-            'choice_label' => function (User $u) {
-                return $this->userRender->renderString($u, []);
-            },
+        $builder->add('accepted_agents', PickUserDynamicType::class, [
             'multiple' => true,
-            'expanded' => true,
         ]);
     }