Couple of fixes for custom User model. 

Tested with Django 1.4.3+ and obviously 1.5. 
Cheers.