diff --git a/endpoints/callbacks.py b/endpoints/callbacks.py
index 37a5471c8..43aa2ac6b 100644
--- a/endpoints/callbacks.py
+++ b/endpoints/callbacks.py
@@ -21,11 +21,11 @@ client = app.config['HTTPCLIENT']
 callback = Blueprint('callback', __name__)
 
 
-def exchange_github_code_for_token(code):
+def exchange_github_code_for_token(code, for_login=True):
   code = request.args.get('code')
   payload = {
-    'client_id': app.config['GITHUB_CLIENT_ID'],
-    'client_secret': app.config['GITHUB_CLIENT_SECRET'],
+    'client_id': app.config['GITHUB_LOGIN_CLIENT_ID' if for_login else 'GITHUB_CLIENT_ID'],
+    'client_secret': app.config['GITHUB_LOGIN_CLIENT_SECRET' if for_login else 'GITHUB_CLIENT_SECRET'],
     'code': code,
   }
   headers = {
@@ -120,7 +120,7 @@ def github_oauth_attach():
 def attach_github_build_trigger(namespace, repository):
   permission = AdministerRepositoryPermission(namespace, repository)
   if permission.can():
-    token = exchange_github_code_for_token(request.args.get('code'))
+    token = exchange_github_code_for_token(request.args.get('code'), for_login=False)
     repo = model.get_repository(namespace, repository)
     if not repo:
       msg = 'Invalid repository: %s/%s' % (namespace, repository)
diff --git a/static/js/app.js b/static/js/app.js
index 9d555b899..6a74554c9 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -937,6 +937,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading
       keyService['githubClientId'] = Config['GITHUB_CLIENT_ID'];
       keyService['githubLoginClientId'] = Config['GITHUB_LOGIN_CLIENT_ID'];
       keyService['githubRedirectUri'] = Config.getUrl('/oauth2/github/callback');
+
       return keyService;
     }]);
   
@@ -1814,7 +1815,7 @@ quayApp.directive('signinForm', function () {
         // Needed to ensure that UI work done by the started callback is finished before the location
         // changes.
         $timeout(function() {
-          var url = 'https://github.com/login/oauth/authorize?client_id=' + encodeURIComponent(KeyService.githubClientId) +
+          var url = 'https://github.com/login/oauth/authorize?client_id=' + encodeURIComponent(KeyService.githubLoginClientId) +
                 '&scope=user:email' + mixpanelDistinctIdClause;
           document.location = url;
         }, 250);
@@ -1879,7 +1880,7 @@ quayApp.directive('signupForm', function () {
         });
       }
 
-      $scope.githubClientId = KeyService.githubClientId;
+      $scope.githubClientId = KeyService.githubLoginClientId;
 
       $scope.awaitingConfirmation = false;
       $scope.registering = false;
diff --git a/static/js/controllers.js b/static/js/controllers.js
index 2c32d433d..74e6b2a24 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -1622,7 +1622,7 @@ function UserAdminCtrl($scope, $timeout, $location, ApiService, PlanService, Use
   $scope.convertStep = 0;
   $scope.org = {};
   $scope.githubRedirectUri = KeyService.githubRedirectUri;
-  $scope.githubClientId = KeyService.githubClientId;
+  $scope.githubClientId = KeyService.githubLoginClientId;
   $scope.authorizedApps = null;
 
   $scope.logsShown = 0;