diff --git a/submissions/views.py b/submissions/views.py
index 1cd915072877aeed08fec352c19a4fec2ca8888e..e36b8a53524b143369d24b5717aa3691cf51d58e 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -277,6 +277,16 @@ class SubmissionCreateView(CreateView):
             ed_admins = Group.objects.get(name='Editorial Administrators')
             assign_perm('can_take_editorial_actions', ed_admins, submission)
 
+            # Assign editor
+            assignment = EditorialAssignment(
+                submission=submission,
+                to=submission.editor_in_charge,
+                accepted=True,
+                date_created=timezone.now(),
+                date_answered=timezone.now(),
+            )
+            assignment.save()
+
             # Send emails
             SubmissionUtils.load({'submission': submission})
             SubmissionUtils.send_authors_resubmission_ack_email()