diff --git a/submissions/managers.py b/submissions/managers.py
index dc73320955c2e4f1e1cc2c8578c6c7e0fd7f1a9a..24f727df7f61d21eb6c166a4780a951f206d923b 100644
--- a/submissions/managers.py
+++ b/submissions/managers.py
@@ -219,10 +219,8 @@ class SubmissionQuerySet(models.QuerySet):
             return self.none()
 
         return self.filter(is_current=True, status__in=[
-            constants.STATUS_INCOMING,
-            constants.STATUS_UNASSIGNED,
-            constants.STATUS_EIC_ASSIGNED,
-            ], submitted_by=user.contributor)
+            constants.STATUS_INCOMING, constants.STATUS_UNASSIGNED, constants.STATUS_EIC_ASSIGNED,
+            ], authors=user.contributor)
 
 
 class SubmissionEventQuerySet(models.QuerySet):
diff --git a/submissions/models.py b/submissions/models.py
index 8c71c49e5d1c293c04ab94ec568f0bfbc37e2d0a..a438e8a4aac4868c2e344af6b04dc223faddb1a6 100644
--- a/submissions/models.py
+++ b/submissions/models.py
@@ -77,8 +77,7 @@ class Submission(models.Model):
     is_current = models.BooleanField(default=True)
     visible_public = models.BooleanField("Is publicly visible", default=False)
     visible_pool = models.BooleanField("Is visible in the Pool", default=False)
-    is_resubmission_of = models.ForeignKey(
-        'self', blank=True, null=True, related_name='successor')
+    is_resubmission_of = models.ForeignKey('self', blank=True, null=True, related_name='successor')
     thread_hash = models.UUIDField(default=uuid.uuid4)
     _is_resubmission = models.BooleanField(default=False)
     refereeing_cycle = models.CharField(