Updated login and user forms

to remove phone/job title and add username