More quickly scrawled / untested custom user model support changes