user model fixes