removed ambiguity between email/login field
changed structure of user form so it can be used for profile