Fix invalid fields display, email trim