diff --git a/metaci/users/management/commands/packaging_org_users.py b/metaci/users/management/commands/packaging_org_users.py
index fe6cc19d7..8bc159881 100644
--- a/metaci/users/management/commands/packaging_org_users.py
+++ b/metaci/users/management/commands/packaging_org_users.py
@@ -38,7 +38,7 @@ def _handle_packaging_org(org):
         org_config.refresh_oauth_token(keychain=None)
         sf = org_config.salesforce_client
         users = sf.query(
-            "SELECT Name, Email, UserType, IsActive, Profile.Name, Title from User WHERE IsActive=True"
+            "SELECT Name, Email, UserType, IsActive, Profile.Name, Title from User WHERE IsActive=True AND UserType='Standard'"
         )
         name, namespace = None, None
         try:
diff --git a/metaci/users/management/commands/tests/test_packaging_org_users.py b/metaci/users/management/commands/tests/test_packaging_org_users.py
index 34ff1382a..9ac0a19de 100644
--- a/metaci/users/management/commands/tests/test_packaging_org_users.py
+++ b/metaci/users/management/commands/tests/test_packaging_org_users.py
@@ -25,7 +25,7 @@ def fake_query(query):
         raise SalesforceMalformedRequest("Q", "R", "S", "T")
     elif (
         query
-        == "SELECT Name, Email, UserType, IsActive, Profile.Name, Title from User WHERE IsActive=True"
+        == "SELECT Name, Email, UserType, IsActive, Profile.Name, Title from User WHERE IsActive=True AND UserType='Standard'"
     ):
         return {
             "records": [