diff --git a/gracedb/migrations/auth/0022_populate_raven_users_group.py b/gracedb/migrations/auth/0022_populate_raven_users_group.py
index 44a8e693561cb93c645b5bd697043d773796b2f0..441f667666ff6584ccbce6ed721004e104921a20 100644
--- a/gracedb/migrations/auth/0022_populate_raven_users_group.py
+++ b/gracedb/migrations/auth/0022_populate_raven_users_group.py
@@ -17,11 +17,12 @@ def add_users(apps, schema_editor):
     # Get group
     pg = Group.objects.get(name=GROUP_NAME)
 
-    # Get users
-    users = User.objects.filter(username__in=USERS)
+    # Users might not exist yet since they are populated from the LDAP
+    for username in USERS:
+        user, _ = User.objects.get_or_create(username=username)
 
-    # Add users
-    pg.user_set.add(*users)
+        # Add user to group
+        pg.user_set.add(user)
 
 
 def remove_users(apps, schema_editor):