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)