Fix issue with User model