diff --git a/endpoints/trigger.py b/endpoints/trigger.py
index 3a9813428..c84766d16 100644
--- a/endpoints/trigger.py
+++ b/endpoints/trigger.py
@@ -226,7 +226,7 @@ class GithubBuildTrigger(BuildTrigger):
         'personal': False,
         'repos': repo_list,
         'info': {
-          'name': org.name,
+          'name': org.name or org.login,
           'avatar_url': org.avatar_url
         }
       })