diff --git a/scipost/managers.py b/scipost/managers.py
index 5ed6efd72c6b6dd4ee64791308fa36efafb79cfe..fcb78b3d9878180c70042b4b90f19e7a29206966 100644
--- a/scipost/managers.py
+++ b/scipost/managers.py
@@ -25,7 +25,7 @@ class ContributorQuerySet(models.QuerySet):
     def available(self):
         return self.exclude(
             unavailability_periods__start__lte=today,
-            unavailability_periods__end__lte=today)
+            unavailability_periods__end__gte=today)
 
     def awaiting_validation(self):
         return self.filter(user__is_active=False, status=CONTRIBUTOR_NEWLY_REGISTERED)
diff --git a/submissions/forms.py b/submissions/forms.py
index 3784031645d090097fa265db42b42111e08258cb..99ec16dd5c4b04c6b7fb0b1cd3e0af3af6917258 100644
--- a/submissions/forms.py
+++ b/submissions/forms.py
@@ -435,7 +435,7 @@ class EditorialAssignmentForm(forms.ModelForm):
         self.submission = kwargs.pop('submission')
         super().__init__(*args, **kwargs)
         self.fields['to'].queryset = Contributor.objects.available().filter(
-            fellowships__pool=self.submission).distinct()
+            fellowships__pool=self.submission).distinct().order_by('user__last_name')
 
     def save(self, commit=True):
         self.instance.submission = self.submission