Non-working: First bit of migrating to a custom user model

Non-working: First bit of migrating to a custom user model #1908