refactor user model and remove account.html