Index: django/contrib/auth/admin.py
===================================================================
--- django/contrib/auth/admin.py        (revision 8066)
+++ django/contrib/auth/admin.py        (working copy)
@@ -1,4 +1,5 @@
 from django.contrib.auth.models import User, Group
+from django.contrib.auth.forms import UserCreationForm
 from django.core.exceptions import PermissionDenied
 from django import template
 from django.shortcuts import render_to_response
@@ -24,14 +25,14 @@
     search_fields = ('username', 'first_name', 'last_name', 'email')
     ordering = ('username',)
     filter_horizontal = ('user_permissions',)
+
+    creation_form=UserCreationForm

     def add_view(self, request):
-        # avoid a circular import. see #6718.
-        from django.contrib.auth.forms import UserCreationForm
         if not self.has_change_permission(request):
             raise PermissionDenied
         if request.method == 'POST':
-            form = UserCreationForm(request.POST)
+            form = self.creation_form(request.POST)
             if form.is_valid():
                 new_user = form.save()
                 msg = _('The %(name)s "%(obj)s" was added successfully.') % {'name': 'user', 'obj': new_user}
@@ -42,7 +43,7 @@
                     request.user.message_set.create(message=msg + ' ' + ugettext("You may edit it again below."))
                     return HttpResponseRedirect('../%s/' % new_user.id)
         else:
-            form = UserCreationForm()
+            form = self.creation_form()
         return render_to_response('admin/auth/user/add_form.html', {
             'title': _('Add user'),
             'form': form,
@@ -55,9 +56,9 @@
             'has_file_field': False,
             'has_absolute_url': False,
             'auto_populated_fields': (),
-            'opts': User._meta,
+            'opts': self.model._meta,
             'save_as': False,
-            'username_help_text': User._meta.get_field('username').help_text,
+            'username_help_text': self.model._meta.get_field('username').help_text,
             'root_path': self.admin_site.root_path,
         }, context_instance=template.RequestContext(request))