diff --git a/biscuit/apps/chronos/forms.py b/biscuit/apps/chronos/forms.py
index f9f304ed6093edf5a997d98f8a294015a319b1b1..504e63570bc82bfefd60d639805609131b9dcd80 100644
--- a/biscuit/apps/chronos/forms.py
+++ b/biscuit/apps/chronos/forms.py
@@ -25,5 +25,7 @@ class LessonSubstitutionForm(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        self.fields['lesson_period'].queryset = LessonPeriod.objects.all()
+        self.fields['subject'].queryset = Subject.objects.all()
         self.fields['teachers'].queryset = Person.objects.all()
-        self.fields['room'].queryset = Person.objects.all()
+        self.fields['room'].queryset = Room.objects.all()