Simplify login form a bit

flask_security/forms.py

@@ -42,8 +42,9 @@ def valid_user_email(form, field):
 
 class Form(BaseForm):
     def __init__(self, *args, **kwargs):
-        super(Form, self).__init__(csrf_enabled=not current_app.testing,
-                                   *args, **kwargs)
+        kwargs.setdefault('csrf_enabled', not current_app.testing)
+        super(Form, self).__init__(*args, **kwargs)
+
 
 class EmailFormMixin():
     email = TextField("Email Address",
@@ -133,7 +134,7 @@ class PasswordlessLoginForm(Form, UserEmailFormMixin):
 
 class LoginForm(Form, NextFormMixin):
     """The default login form"""
-    email = TextField('Email Address', validators=[Email()])
+    email = TextField('Email Address')
     password = PasswordField('Password')
     remember = BooleanField("Remember Me")
     submit = SubmitField("Login")
@@ -142,8 +143,16 @@ class LoginForm(Form, NextFormMixin):
         super(LoginForm, self).__init__(*args, **kwargs)
 
     def validate(self):
-        if not super(LoginForm, self).validate():
+        super(LoginForm, self).validate()
+
+        if self.email.data.strip() == '':
+            self.email.errors.append('Email not provided')
             return False
+
+        if self.password.data.strip() == '':
+            self.email.errors.append('Password not provided')
+            return False
+
         self.user = _datastore.find_user(email=self.email.data)
 
         if self.user is None: