added user validation and required fields
Fixed merge for user model