some changes to account and user model