diff --git a/static/directives/external-login-button.html b/static/directives/external-login-button.html
index cc1d39bbd..d241089d6 100644
--- a/static/directives/external-login-button.html
+++ b/static/directives/external-login-button.html
@@ -1,6 +1,6 @@
 <span class="external-login-button-element">
   <span ng-if="provider == 'github'">
-    <a href="javascript:void(0)" class="btn btn-primary btn-block" quay-require="['GITHUB_LOGIN']" ng-click="startSignin('github')" style="margin-bottom: 10px">
+    <a href="javascript:void(0)" class="btn btn-primary btn-block" quay-require="['GITHUB_LOGIN']" ng-click="startSignin('github')" style="margin-bottom: 10px" ng-disabled="signingIn">
       <i class="fa fa-github fa-lg"></i> 
       <span ng-if="action != 'attach'">Sign In with GitHub</span>
       <span ng-if="action == 'attach'">Attach to GitHub Account</span>
@@ -8,7 +8,7 @@
   </span>
   
   <span ng-if="provider == 'google'">
-    <a href="javascript:void(0)" class="btn btn-primary btn-block" quay-require="['GOOGLE_LOGIN']"  ng-click="startSignin('google')">
+    <a href="javascript:void(0)" class="btn btn-primary btn-block" quay-require="['GOOGLE_LOGIN']"  ng-click="startSignin('google')" ng-disabled="signingIn">
       <i class="fa fa-google fa-lg"></i> 
       <span ng-if="action != 'attach'">Sign In with Google</span>
       <span ng-if="action == 'attach'">Attach to Google Account</span>
diff --git a/static/directives/signin-form.html b/static/directives/signin-form.html
index de67c18f6..59551b51c 100644
--- a/static/directives/signin-form.html
+++ b/static/directives/signin-form.html
@@ -1,5 +1,6 @@
 <div class="signin-form-element">
-  <form class="form-signin" ng-submit="signin();">
+  <span class="quay-spinner" ng-show="signingIn"></span>
+  <form class="form-signin" ng-submit="signin();" ng-show="!signingIn">
     <input type="text" class="form-control input-lg" name="username"
            placeholder="Username or E-mail Address" ng-model="user.username" autofocus>
     <input type="password" class="form-control input-lg" name="password"
diff --git a/static/js/app.js b/static/js/app.js
index 02761beac..0bcf38c74 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -2636,21 +2636,19 @@ quayApp.directive('externalLoginButton', function () {
       'action': '@action'
     },
     controller: function($scope, $timeout, $interval, ApiService, KeyService, CookieService, Features, Config) {
-      var getRedirectUrl = function() {
-        return $scope.redirectUrl;
-      };
-
+      $scope.signingIn = false;
       $scope.startSignin = function(service) {
         $scope.signInStarted({'service': service});
 
         var url = KeyService.getExternalLoginUrl(service, $scope.action || 'login');
         
         // Save the redirect URL in a cookie so that we can redirect back after the service returns to us.
-        var redirectURL = getRedirectUrl() || window.location.toString();
+        var redirectURL = $scope.redirectUrl || window.location.toString();
         CookieService.putPermanent('quay.redirectAfterLoad', redirectURL);
 
         // Needed to ensure that UI work done by the started callback is finished before the location
         // changes.
+        $scope.signingIn = true;
         $timeout(function() {
           document.location = url;
         }, 250);
@@ -2676,8 +2674,10 @@ quayApp.directive('signinForm', function () {
     controller: function($scope, $location, $timeout, $interval, ApiService, KeyService, UserService, CookieService, Features, Config) {
       $scope.tryAgainSoon = 0;
       $scope.tryAgainInterval = null;
+      $scope.signingIn = false;
 
       $scope.markStarted = function() {
+       $scope.signingIn = true;
        if ($scope.signInStarted != null) {
          $scope.signInStarted();
        }
@@ -2708,6 +2708,7 @@ quayApp.directive('signinForm', function () {
         $scope.cancelInterval();
 
         ApiService.signinUser($scope.user).then(function() {
+          $scope.signingIn = false;
           $scope.needsEmailVerification = false;
           $scope.invalidCredentials = false;
 
@@ -2722,13 +2723,15 @@ quayApp.directive('signinForm', function () {
           // Note: The timeout of 500ms is needed to ensure dialogs containing sign in
           // forms get removed before the location changes.
           $timeout(function() {
-            var redirectUrl = getRedirectUrl();
+            var redirectUrl = $scope.redirectUrl;
             if (redirectUrl == $location.path() || redirectUrl == null) {
               return;
             }
             window.location = (redirectUrl ? redirectUrl : '/');
           }, 500);
         }, function(result) {
+          $scope.signingIn = false;
+
           if (result.status == 429 /* try again later */) {
             $scope.needsEmailVerification = false;
             $scope.invalidCredentials = false;