diff --git a/buildbot/github_buildbot.py b/buildbot/github_buildbot.py
index 5dcd4b9e..a4f0c6f1 100755
--- a/buildbot/github_buildbot.py
+++ b/buildbot/github_buildbot.py
@@ -139,7 +139,8 @@ def process_change(self, payload, user, repo, repo_url, project, request):
             for change in payload['commits']:
                 files = change['added'] + change['removed'] + change['modified']
                 who = "%s <%s>" % (
-                    change['author']['username'], change['author']['email'])
+                    change['author']['username'] if 'username' in change["author"] else change["author"]["name"],
+                    change['author']['email'])
 
                 changes.append(
                     {'revision': change['id'],