User model bug fixes