diff --git a/odevzdavatko/forms.py b/odevzdavatko/forms.py
index 2d2a8990..1a4e0a74 100644
--- a/odevzdavatko/forms.py
+++ b/odevzdavatko/forms.py
@@ -21,13 +21,23 @@ class DateInput(forms.DateInput):
 
 
 class PosliReseniForm(forms.Form):
-	#FIXME jen podproblémy daného problému
-	problem = forms.ModelChoiceField(label='Problém',queryset=m.Problem.objects.all())
+	problem = forms.ModelMultipleChoiceField(
+		queryset=m.Problem.objects.all(),
+		label="Problémy",
+		widget=autocomplete.ModelSelect2Multiple(
+			url='autocomplete_problem_odevzdatelny',
+			attrs={
+				'data-placeholder--id': '-1',
+				'data-placeholder--text': '---',
+				'data-allow-clear': 'true'
+				},
+			),
+	)
 	# to_field_name
 	#problem = models.ManyToManyField(Problem, verbose_name='problém', help_text='Problém',
 	#	through='Hodnoceni')
 
-	resitel = forms.ModelChoiceField(label="Řešitel",
+	resitel = forms.ModelMultipleChoiceField(label="Řešitelé",
 		queryset=Resitel.objects.all(),
 		widget=autocomplete.ModelSelect2Multiple(
 			url='autocomplete_resitel',
diff --git a/odevzdavatko/views.py b/odevzdavatko/views.py
index d3c74812..5660af71 100644
--- a/odevzdavatko/views.py
+++ b/odevzdavatko/views.py
@@ -360,8 +360,8 @@ class PosliReseniView(LoginRequiredMixin, FormView):
 			forma=data['forma'],
 			poznamka=data['poznamka'],
 		)
-		nove_reseni.resitele.add(data['resitel'])
-		nove_reseni.problem.add(data['problem'])
+		nove_reseni.resitele.add(*data['resitel'])
+		nove_reseni.problem.add(*data['problem'])
 		nove_reseni.save()
 
 		context = self.get_context_data()