UserModel Bug Fixes