Index: parts/auth/formfields.py
===================================================================
--- parts/auth/formfields.py	(revision 1958)
+++ parts/auth/formfields.py	(working copy)
@@ -1,4 +1,4 @@
-from django.models.auth import User
+from django.contrib.auth.models import User
 from django.core import validators
 from django import forms
 
Index: views/registration/passwords.py
===================================================================
--- views/registration/passwords.py	(revision 1958)
+++ views/registration/passwords.py	(working copy)
@@ -2,8 +2,8 @@
 from django.core import validators
 from django.core.extensions import render_to_response
 from django.template import Context, RequestContext, loader
-from django.models.auth import User
-from django.models.core import Site
+from django.contrib.auth.models import User
+from django.contrib.sites.models import Site
 from django.views.decorators.auth import login_required
 from django.http import HttpResponseRedirect