diff --git a/data/model.py b/data/model.py
index f351e5ff8..091c5e102 100644
--- a/data/model.py
+++ b/data/model.py
@@ -820,8 +820,13 @@ def create_repository(namespace, name, creating_user, visibility='private'):
       for team, role in final_protos.values():
         RepositoryPermission.create(team=team, repository=repo, role=role)
 
+      user_protos = (PermissionPrototype
+                      .select()
+                      .where(PermissionPrototype.org == org, user_clause,
+                             PermissionPrototype.delegate_team >> None))
+
       final_user_protos = {}
-      for proto in team_protos:
+      for proto in user_protos:
         # We will skip the proto if it is pre-empted by a more important proto
         if (proto.delegate_user.username in final_user_protos and
             proto.activating_user is None):