diff --git a/static/js/app.js b/static/js/app.js
index 5fb21205b..f44e4294e 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -2278,6 +2278,14 @@ quayApp.directive('signinForm', function () {
        }
       };
 
+      $scope.$watch('user.username', function() {
+        $scope.tryAgainSoon = 0;
+
+        if ($scope.tryAgainInterval) {
+          $interval.cancel($scope.tryAgainInterval);
+        }
+      });
+
       $scope.$on('$destroy', function() {
         if ($scope.tryAgainInterval) {
           $interval.cancel($scope.tryAgainInterval);
@@ -2325,6 +2333,9 @@ quayApp.directive('signinForm', function () {
                 $scope.tryAgainSoon = 0;
               }
             }, 1000, $scope.tryAgainSoon);
+
+            $scope.needsEmailVerification = false;
+            $scope.invalidCredentials = false;
           } else {
             $scope.needsEmailVerification = result.data.needsEmailVerification;
             $scope.invalidCredentials = result.data.invalidCredentials;