Updates to handle custom user model change from Django 1.5