Bug fix on user model