diff --git a/buildtrigger/githubhandler.py b/buildtrigger/githubhandler.py
index 78ffe580a..980f61463 100644
--- a/buildtrigger/githubhandler.py
+++ b/buildtrigger/githubhandler.py
@@ -292,10 +292,11 @@ class GithubBuildTrigger(BuildTriggerHandler):
     }
 
     for org in usr.get_orgs():
-      namespaces[org.name] = {
+      organization = org.login if org.login else org.name
+      namespaces[organization] = {
         'personal': False,
-        'id': org.login,
-        'title': org.name or org.login,
+        'id': organization,
+        'title': organization,
         'avatar_url': org.avatar_url,
         'url': org.html_url,
         'score': org.plan.private_repos if org.plan else 0,