From 9e97e3d90703a076e22af300363b7a4732e3a6f5 Mon Sep 17 00:00:00 2001
From: Matt Warren <matt.warren@gmail.com>
Date: Sun, 5 Oct 2014 21:58:32 -0600
Subject: [PATCH 1/2] addresses issue mentioned here:
 https://code.djangoproject.com/ticket/19353 adding users in admin resulted in
 reference to auth.User

---
 .../{{cookiecutter.repo_name}}/users/admin.py | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/admin.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/admin.py
index 80e8e792f..e03919590 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/admin.py
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/admin.py
@@ -6,9 +6,27 @@ from django.contrib.auth.admin import UserAdmin as AuthUserAdmin
 from .models import User
 
 
+class MyUserChangeForm(UserChangeForm):
+    class Meta(UserChangeForm.Meta):
+        model = User
+
+
+class MyUserCreationForm(UserCreationForm):
+    class Meta(UserCreationForm.Meta):
+        model = User
+
+    def clean_username(self):
+        username = self.cleaned_data["username"]
+        try:
+            User.objects.get(username=username)
+        except User.DoesNotExist:
+            return username
+        raise forms.ValidationError(self.error_messages['duplicate_username'])
+
+
 class UserAdmin(AuthUserAdmin):
-    create_form_class = UserCreationForm
-    update_form_class = UserChangeForm
+    form = MyUserChangeForm
+    add_form = MyUserCreationForm
 
 
 admin.site.register(User, UserAdmin)

From 4dc030110906bb4fc1ef21e7746fce23675a16f8 Mon Sep 17 00:00:00 2001
From: Matt Warren <matt.warren@gmail.com>
Date: Sun, 5 Oct 2014 22:03:15 -0600
Subject: [PATCH 2/2] add myself to contributors.rst

---
 CONTRIBUTORS.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 7a43403f1..d7a468ff7 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -31,6 +31,7 @@ Alberto Sanchez / @alb3rto
 Eyad Al Sibai / @eyadsibai
 Chris Franklin
 Benjamin Abel
+Matt Warren / @mfwarren
 
 * Possesses commit rights