Start with update user part
Removed some lack of HTML validation