use get_user_model

pandora/user/models.py

@@ -4,7 +4,8 @@ from __future__ import division, print_function, absolute_import
 import copy
 from datetime import datetime
 
-from django.contrib.auth.models import User, Group
+from django.contrib.auth.models import Group
+from django.contrib.auth import get_user_model
 from django.db import models
 from django.db.models import Max
 from django.conf import settings
@@ -23,6 +24,7 @@ from . import managers
 from . import tasks
 from .utils import get_ip, get_location
 
+User = get_user_model()
 
 @python_2_unicode_compatible
 class SessionData(models.Model):

pandora/user/views.py

@@ -13,7 +13,8 @@ from django.core.mail import send_mail, BadHeaderError, EmailMessage
 from django.shortcuts import redirect
 from django.db import transaction
 from django.db.models import Max
-from django.contrib.auth.models import User, Group
+from django.contrib.auth.models import Group
+from django.contrib.auth import get_user_model
 from django.contrib.sessions.models import Session
 
 from oxdjango.shortcuts import render_to_json_response, json_response, get_object_or_404_json
@@ -30,6 +31,7 @@ from . import models
 from .decorators import capability_required_json
 from .utils import rename_user
 
+User = get_user_model()
 
 def get_user_or_404(data):
     if 'id' in data: