Updated to allow the ability to use custom User Model (as added in Django 1.5)