Fix up user model