diff --git a/bam/forms.py b/bam/forms.py
index 58352643ce0c29c9b777bff3dda840bae919de30..d58ed3da75d0d28d51107221d94821e33ddd117d 100644
--- a/bam/forms.py
+++ b/bam/forms.py
@@ -1,18 +1,28 @@
 from flask_wtf import FlaskForm
-from wtforms import StringField, PasswordField, SubmitField, BooleanField
+from wtforms import PasswordField, SubmitField, BooleanField
+from wtforms.fields.html5 import EmailField
 from wtforms.validators import DataRequired, Length, Email, EqualTo, ValidationError
 from bam.models import User
 
 
 class RegistrationForm(FlaskForm):
-    email = StringField("Email", validators=[DataRequired(), Email()], render_kw={"placeholder": "Enter your email"})
-    password = PasswordField("Password", validators=[DataRequired()], render_kw={"placeholder": "Choose a strong password"})
+    email = EmailField(
+        "Email",
+        validators=[DataRequired(), Email()],
+        render_kw={"placeholder": "Enter your email"},
+    )
+    password = PasswordField(
+        "Password",
+        validators=[DataRequired()],
+        render_kw={"placeholder": "Choose a strong password"},
+    )
     confirm_password = PasswordField(
-        "Confirm Password", validators=[DataRequired(), EqualTo("password")],
-        render_kw={"placeholder":"Re-enter your password"}
+        "Confirm Password",
+        validators=[DataRequired(), EqualTo("password")],
+        render_kw={"placeholder": "Re-enter your password"},
     )
 
-    submit = SubmitField("Sign Up")
+    submit = SubmitField("Register")
 
     def validate_email(self, email):
         if User.query.filter_by(email=email.data).first():
@@ -20,7 +30,15 @@ class RegistrationForm(FlaskForm):
 
 
 class LoginForm(FlaskForm):
-    email = StringField("Email", validators=[DataRequired(), Email()], render_kw={"placeholder": "bookmaster@bam.com"})
-    password = PasswordField("Password", validators=[DataRequired()], render_kw={"placeholder": "masterofbooks"})
+    email = EmailField(
+        "Email",
+        validators=[DataRequired(), Email()],
+        render_kw={"placeholder": "bookmaster@bam.com"},
+    )
+    password = PasswordField(
+        "Password",
+        validators=[DataRequired()],
+        render_kw={"placeholder": "masterofbooks"},
+    )
     remember = BooleanField("Remember Me")
     submit = SubmitField("Login")