Fixes to custom user model so it works...!