Fix up User model