better 1.5 custom user model support, with backwards compatibility in mind
pep8