Update user model to work with 1.5