More work on the "email-user" model using the approach of keeping it
within d.c.auth and putting it within the inheritance chain.

TODO: The current work fails two tests where I must update the tests,
and lacks its own tests.