diff --git a/app/main/forms.py b/app/main/forms.py
index 342a2a6b1..ff9ab75bd 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -205,7 +205,7 @@ class StripWhitespaceStringField(StringField):
 
 
 class LoginForm(StripWhitespaceForm):
-    email_address = StringField('Email address', validators=[
+    email_address = EmailField('Email address', validators=[
         Length(min=5, max=255),
         DataRequired(message='Can’t be empty'),
         ValidEmail()
diff --git a/app/templates/views/signin.html b/app/templates/views/signin.html
index ff062927c..031ac928c 100644
--- a/app/templates/views/signin.html
+++ b/app/templates/views/signin.html
@@ -30,7 +30,7 @@
       </p>
     {% endif %}
 
-    <form method="post" autocomplete="off" novalidate>
+    <form method="post" novalidate>
       {{ textbox(form.email_address) }}
       {{ textbox(form.password) }}
       {{ page_footer("Continue", secondary_link=url_for('.forgot_password'), secondary_link_text="Forgot your password?") }}