diff --git a/data/model/legacy.py b/data/model/legacy.py
index ced35063f..8a5a3b9fa 100644
--- a/data/model/legacy.py
+++ b/data/model/legacy.py
@@ -601,12 +601,13 @@ def get_matching_users(username_prefix, robot_namespace=None,
                           (User.robot == True)))
 
   query = (User
-    .select(User.username, fn.Sum(Team.id), User.robot)
+    .select(User.username, User.robot)
     .group_by(User.username)
     .where(direct_user_query))
 
   if organization:
     query = (query
+      .select(User.username, User.robot, fn.Sum(Team.id))
       .join(TeamMember, JOIN_LEFT_OUTER)
       .join(Team, JOIN_LEFT_OUTER, on=((Team.id == TeamMember.team) &
                                        (Team.organization == organization))))
@@ -615,9 +616,9 @@ def get_matching_users(username_prefix, robot_namespace=None,
   class MatchingUserResult(object):
     def __init__(self, *args):
       self.username = args[0]
-      self.is_robot = args[2]
+      self.is_robot = args[1]
       if organization:
-        self.is_org_member = (args[1] != None)
+        self.is_org_member = (args[2] != None)
       else:
         self.is_org_member = None