diff --git a/public/js/controllers/authCtrl.js b/public/js/controllers/authCtrl.js
index 7f9d242cf5..64bf201a9f 100644
--- a/public/js/controllers/authCtrl.js
+++ b/public/js/controllers/authCtrl.js
@@ -82,13 +82,17 @@ angular.module('authCtrl', [])
       };
 
       $scope.passwordReset = function(email){
-        $http.post(ApiUrlService.get() + '/api/v2/user/reset-password', {email:email})
-          .success(function(){
-            alert(window.env.t('newPassSent'));
-          })
-          .error(function(data){
-            alert(data.err);
-          });
+        if(email == null || email.length == 0) {
+          alert(window.env.t('invalidEmail'));
+        } else {
+          $http.post(ApiUrlService.get() + '/api/v2/user/reset-password', {email:email})
+            .success(function(){
+              alert(window.env.t('newPassSent'));
+            })
+            .error(function(data){
+                alert(data.err);
+            });
+          }
       };
 
       $scope.expandMenu = function(menu) {
diff --git a/views/static/login-modal.jade b/views/static/login-modal.jade
index 1eb90cd6b5..5332b972b8 100644
--- a/views/static/login-modal.jade
+++ b/views/static/login-modal.jade
@@ -39,12 +39,12 @@ script(id='modals/login.html', type='text/ng-template')
                 a(data-toggle="collapse" data-parent="#forgot-password" href="#forgot-password-panel")=env.t('forgotPass')
           
             .panel-body.collapse#forgot-password-panel
-              form(ng-submit='passwordReset(passwordResetEmail)')
+              form(name='passwordResetForm', ng-submit='passwordReset(passwordResetEmail)', novalidate)
                 //.alert.alert-success {.success.passwordReset}
                 //.control-group.{#if..errors.passwordReset}error{/}
                 h3=env.t('emailNewPass')
                 .form-group
-                  input.form-control(type='text', name='email', placeholder=env.t('email') , ng-model='passwordResetEmail')
+                  input.form-control(type='email', name='email', placeholder=env.t('email') , ng-model='passwordResetEmail')
                   //span.help-inline {.errors.passwordReset}
                 .form-group
                   input.btn.btn-default(type='submit', value=env.t('submit'))