diff --git a/src/Form/TeamEditForm.php b/src/Form/TeamEditForm.php
index 3f741029..fa1483c3 100644
--- a/src/Form/TeamEditForm.php
+++ b/src/Form/TeamEditForm.php
@@ -27,8 +27,13 @@ class TeamEditForm extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
+        $users = [];
+
         /** @var Team|null $team */
         $team = $options['data'] ?? null;
+        if ($team !== null) {
+            $users = $team->getUsers();
+        }
 
         $builder
             ->add('name', TextType::class, [
@@ -48,6 +53,7 @@ class TeamEditForm extends AbstractType
             'entry_type' => TeamMemberType::class,
             'entry_options' => [
                 'label' => false,
+                'include_users' => $users
             ],
             'allow_add' => true,
             'by_reference' => false,
diff --git a/src/Form/Type/TeamMemberType.php b/src/Form/Type/TeamMemberType.php
index 4d187781..1f1a4600 100644
--- a/src/Form/Type/TeamMemberType.php
+++ b/src/Form/Type/TeamMemberType.php
@@ -20,6 +20,7 @@ class TeamMemberType extends AbstractType
     {
         $builder->add('user', UserType::class, [
             'selectpicker' => false,
+            'include_users' => $options['include_users'],
         ]);
 
         $builder->add('teamlead', YesNoType::class, [
@@ -41,6 +42,7 @@ class TeamMemberType extends AbstractType
             'data_class' => TeamMember::class,
             'label' => 'label.user',
             'compound' => true,
+            'include_users' => [],
         ]);
     }
 }
diff --git a/templates/form/kimai-theme.html.twig b/templates/form/kimai-theme.html.twig
index 0cc5756f..dc29a60c 100644
--- a/templates/form/kimai-theme.html.twig
+++ b/templates/form/kimai-theme.html.twig
@@ -26,6 +26,7 @@
             {% endif %}
             </div>
             {{ form_widget(form.user) }}
+            {{ form_errors(form.user) }}
         </div>
         <div class="col-xs-5">
             {{ form_widget(form.teamlead) }}