Work on forms and add more fields to user