Modify user entity model
Minor bug fixes