From b8f5a9a22d22e7c6a1763f661059b03724e8d235 Mon Sep 17 00:00:00 2001
From: Kyle Brown <kyle.brown@coreos.com>
Date: Wed, 18 Oct 2017 17:28:08 -0700
Subject: [PATCH] Fix bug in Github trigger set up flow

---
 buildtrigger/githubhandler.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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,