diff --git a/UI/WebServerResources/js/Main/Main.app.js b/UI/WebServerResources/js/Main/Main.app.js
index b830f8a71..9d3e93496 100644
--- a/UI/WebServerResources/js/Main/Main.app.js
+++ b/UI/WebServerResources/js/Main/Main.app.js
@@ -89,6 +89,12 @@
     };
 
     this.login = function () {
+      if(vm.loginState == 'passwordrecovery') {
+        if(vm.passwordRecovery.passwordRecoveryMode == 'SecretQuestion')
+          return this.passwordRecoveryCheck();
+        if(vm.passwordRecovery.passwordRecoveryMode == 'SecondaryEmail')
+          return this.passwordRecoveryEmail();
+      }
       vm.loginState = 'authenticating';
       Authentication.login(vm.creds)
         .then(function (data) {
@@ -167,6 +173,12 @@
     };
 
     this.loginName = function() {
+      if(vm.loginState == 'passwordrecovery') {
+        if(vm.passwordRecovery.passwordRecoveryMode == 'SecretQuestion')
+          return this.passwordRecoveryCheck();
+        if(vm.passwordRecovery.passwordRecoveryMode == 'SecondaryEmail')
+          return this.passwordRecoveryEmail();
+      }
       vm.loginState = 'authenticating';
       Authentication.loginName(vm.creds)
         .then(function(data) {