Fix for User model.