diff --git a/app/client/views/login/login.html b/app/client/views/login/login.html
index 2411b6198..c562fbc9d 100644
--- a/app/client/views/login/login.html
+++ b/app/client/views/login/login.html
@@ -20,6 +20,7 @@
               <div class="field">
                 <label> Email</label>
                 <input type="email"
+                       ng-disabled="isBusy"
                        id='email'
                        placeholder="foo@bar.edu"
                        ng-model="email">
@@ -27,12 +28,14 @@
               <div class="field">
                 <label> Password</label>
                 <input type="password"
+                       ng-disabled="isBusy"
                        id='password'
                        placeholder="Password (at least 6 characters)"
                        ng-model="password" required>
               </div>
               <div class="field">
                 <button id="login-password"
+                        ng-disabled="isBusy"
                         type="submit"
                         class="fluid ui login button">
                         Login
@@ -47,6 +50,7 @@
               <button id="register"
                       type="submit"
                       class="fluid ui register button"
+                      ng-disabled="isBusy"
                       ng-click="register()">
                       Register
               </button>
@@ -60,12 +64,14 @@
               <div class="field">
                 <label> Email</label>
                 <input type="email"
+                       ng-disabled="isBusy"
                        id='email'
                        placeholder="foo@bar.edu"
                        ng-model="email">
               </div>
               <div class="field">
                 <button id="forgot-password"
+                        ng-disabled="isBusy"
                         type="submit"
                         class="fluid ui login button">
                         Send Reset Email
diff --git a/app/client/views/login/loginCtrl.js b/app/client/views/login/loginCtrl.js
index 8798a0f2e..08d121fca 100644
--- a/app/client/views/login/loginCtrl.js
+++ b/app/client/views/login/loginCtrl.js
@@ -7,6 +7,7 @@ angular.module('reg')
     'Utils',
     'AuthService',
     function($scope, $http, $state, settings, Utils, AuthService){
+      $scope.isBusy = false;
 
       // Is registration open?
       var Settings = settings.data;
@@ -15,12 +16,22 @@ angular.module('reg')
       // Start state for login
       $scope.loginState = 'login';
 
+      function startWork() {
+        $scope.isBusy = true;
+      }
+
+      function finishWork() {
+        $scope.isBusy = false;
+      }
+
       function onSuccess() {
         $state.go('app.dashboard');
+        finishWork();
       }
 
       function onError(data){
         $scope.error = data.message;
+        finishWork();
       }
 
       function resetError(){
@@ -52,6 +63,7 @@ angular.module('reg')
           return;
         }
 
+        startWork();
         resetError();
         AuthService.loginWithPassword(
           $scope.email, $scope.password, onSuccess, onError);
@@ -62,6 +74,7 @@ angular.module('reg')
           return;
         }
 
+        startWork();
         resetError();
         AuthService.register(
           $scope.email, $scope.password, onSuccess, onError);