User model fix in user service