diff --git a/app/forms/account.py b/app/forms/account.py
index 259e110..f162ffe 100644
--- a/app/forms/account.py
+++ b/app/forms/account.py
@@ -1,6 +1,6 @@
 from flask_wtf import FlaskForm
 from wtforms import StringField, PasswordField, BooleanField, TextAreaField, SubmitField, DecimalField, SelectField
-from wtforms.fields.html5 import DateField
+from wtforms.fields.html5 import DateField, EmailField
 from wtforms.validators import DataRequired, InputRequired, Optional, Email, EqualTo
 from flask_wtf.file import FileField  # Cuz' wtforms' FileField is shitty
 from app.models.trophies import Trophy
@@ -17,11 +17,11 @@ class RegistrationForm(FlaskForm):
             vd.name_available,
         ],
     )
-    email = StringField(
+    email = EmailField(
         'Adresse Email',
         validators=[
             DataRequired(),
-            Email(message="Addresse email invalide."),
+            Email(message="Adresse email invalide."),
             vd.email,
         ],
     )
@@ -62,7 +62,7 @@ class UpdateAccountForm(FlaskForm):
             vd.avatar,
         ],
     )
-    email = StringField(
+    email = EmailField(
         'Adresse email',
         validators=[
             Optional(),
@@ -152,7 +152,7 @@ class AdminUpdateAccountForm(FlaskForm):
             vd.avatar,
         ],
     )
-    email = StringField(
+    email = EmailField(
         'Adresse email',
         validators=[
             Optional(),
diff --git a/app/utils/valid_name.py b/app/utils/valid_name.py
index f6543ae..f3d6642 100644
--- a/app/utils/valid_name.py
+++ b/app/utils/valid_name.py
@@ -29,6 +29,7 @@ def valid_name(name, msg=False):
     try:
         normalized_name = normalize(name)
     except ValueError:
+        normalized_name = None
         errors.append("cant-normalize")
 
     # Rule 3