diff --git a/submissions/forms.py b/submissions/forms.py
index 49afb05a47531a80b36c7cc97e2f9f06b67cf194..90ca3abf981ac90841625ac2df8a4c3eb2294a99 100644
--- a/submissions/forms.py
+++ b/submissions/forms.py
@@ -562,7 +562,6 @@ class EditorialAssignmentForm(forms.ModelForm):
             Submission.objects.filter(id=self.submission.id).update(
                 refereeing_cycle=CYCLE_DEFAULT,
                 status=STATUS_EIC_ASSIGNED,
-                editor_in_charge=self.request.user.contributor,
                 reporting_deadline=deadline,
                 open_for_reporting=True,
                 open_for_commenting=True,
@@ -575,7 +574,6 @@ class EditorialAssignmentForm(forms.ModelForm):
             Submission.objects.filter(id=self.submission.id).update(
                 refereeing_cycle=CYCLE_DIRECT_REC,
                 status=STATUS_EIC_ASSIGNED,
-                editor_in_charge=self.request.user.contributor,
                 reporting_deadline=timezone.now(),
                 open_for_reporting=False,
                 open_for_commenting=True,
@@ -584,6 +582,8 @@ class EditorialAssignmentForm(forms.ModelForm):
 
         if self.has_accepted_invite():
             # Implicitly or explicity accept the assignment and deprecate others.
+            Submission.objects.filter(id=self.submission.id).update(
+                editor_in_charge=self.request.user.contributor,)
             recommendation.accepted = True
             EditorialAssignment.objects.filter(submission=self.submission, accepted=None).exclude(
                 id=recommendation.id).update(deprecated=True)