diff --git a/opentech/apply/funds/migrations/0062_data_migrate_type_for_assigned_reviewers.py b/opentech/apply/funds/migrations/0062_data_migrate_type_for_assigned_reviewers.py
index f2c8b2f4a51b125208067a2971f42017c1649335..ed7f3003a08821a0cf4e45858ea1839434b6c1f5 100644
--- a/opentech/apply/funds/migrations/0062_data_migrate_type_for_assigned_reviewers.py
+++ b/opentech/apply/funds/migrations/0062_data_migrate_type_for_assigned_reviewers.py
@@ -29,12 +29,15 @@ def add_reviewer_type(apps, schema_editor):
                 groups = {PARTNER_GROUP_NAME}
             elif COMMUNITY_REVIEWER_GROUP_NAME in groups:
                 groups = {COMMUNITY_REVIEWER_GROUP_NAME}
-            elif review.author.is_staff or review.author.is_superuser:
+            elif assigned.reviewer.is_staff or assigned.reviewer.is_superuser:
                 groups = {STAFF_GROUP_NAME}
             else:
                 groups = {REVIEWER_GROUP_NAME}
         elif not groups:
-            groups = {REVIEWER_GROUP_NAME}
+            if assigned.reviewer.is_staff or assigned.reviewer.is_superuser:
+                groups = {STAFF_GROUP_NAME}
+            else:
+                groups = {REVIEWER_GROUP_NAME}
 
         group = Group.objects.get(name=groups.pop())
         assigned.type = group
diff --git a/opentech/apply/funds/models/submissions.py b/opentech/apply/funds/models/submissions.py
index 3d7da4704c7dd9016cc7493f753dd824f60adcc0..2906ce528132046be8dbb01b5f60500fc6bc30de 100644
--- a/opentech/apply/funds/models/submissions.py
+++ b/opentech/apply/funds/models/submissions.py
@@ -792,7 +792,10 @@ class AssignedReviewersQuerySet(models.QuerySet):
             else:
                 groups = {REVIEWER_GROUP_NAME}
         elif not groups:
-            groups = {REVIEWER_GROUP_NAME}
+            if assigned.reviewer.is_staff or assigned.reviewer.is_superuser:
+                groups = {STAFF_GROUP_NAME}
+            else:
+                groups = {REVIEWER_GROUP_NAME}
 
         group = Group.objects.get(name=groups.pop())
 
diff --git a/opentech/apply/review/migrations/0018_migrate_author_data.py b/opentech/apply/review/migrations/0018_migrate_author_data.py
index 0b8704d29aefcba4b47ead9863a7082a2a290139..fecd058fd29a9d9fc5e746d941cfc1b155b66561 100644
--- a/opentech/apply/review/migrations/0018_migrate_author_data.py
+++ b/opentech/apply/review/migrations/0018_migrate_author_data.py
@@ -36,7 +36,10 @@ def add_to_assigned_reviewers(apps, schema_editor):
             else:
                 groups = {REVIEWER_GROUP_NAME}
         elif not groups:
-            groups = {REVIEWER_GROUP_NAME}
+            if assigned.reviewer.is_staff or assigned.reviewer.is_superuser:
+                groups = {STAFF_GROUP_NAME}
+            else:
+                groups = {REVIEWER_GROUP_NAME}
 
         group = Group.objects.get(name=groups.pop())