diff --git a/mo/web/org_users.py b/mo/web/org_users.py
index 123e90ada52a8c9a3fad3a0e663174f85d21947d..06fc891500e547f50f73355d0ed0fe7c5b211282 100644
--- a/mo/web/org_users.py
+++ b/mo/web/org_users.py
@@ -447,20 +447,14 @@ def org_user(id: int):
 
 
 class UserEditForm(FlaskForm):
-    first_name = wtforms.StringField("Jméno", validators=[Required()], render_kw={'autofocus': True})
-    last_name = wtforms.StringField("Příjmení", validators=[Required()])
-    email = wtforms.StringField("E-mail", validators=[Required()])
+    first_name = mo_fields.FirstName(validators=[Required()], render_kw={'autofocus': True})
+    last_name = mo_fields.LastName(validators=[Required()])
+    email = mo_fields.Email(validators=[Required()])
     note = wtforms.TextAreaField("Poznámka")
     is_test = wtforms.BooleanField("Testovací účet")
     allow_duplicate_name = wtforms.BooleanField("Přidat účet s duplicitním jménem")
     submit = wtforms.SubmitField("Uložit")
 
-    def validate_email(form, field):
-        try:
-            field.data = mo.users.normalize_email(field.data)
-        except mo.CheckError as e:
-            raise wtforms.ValidationError(str(e))
-
 
 @app.route('/org/org/<int:id>/edit', methods=("GET", "POST"), endpoint="org_org_edit")
 @app.route('/org/user/<int:id>/edit', methods=("GET", "POST"))