This needs to be moved to the User model, so there isn't any refence to the User model specifically outside of contrib.auth.