diff --git a/accounts/forms.py b/accounts/forms.py
index 3c21ac8..83bf2ca 100644
--- a/accounts/forms.py
+++ b/accounts/forms.py
@@ -4,11 +4,15 @@ from django.forms.widgets import PasswordInput
 from accounts.models import *
 
 
-__all__ = ['UserForm', 'GroupForm', 'TeamForm']
+__all__ = ['AddUserForm', 'EditUserForm', 'GroupForm', 'TeamForm']
 
 
-UserForm = modelform_factory(User,
-        fields=['first_name', 'last_name', 'email', 'is_superuser'])
+user_fields=['first_name', 'last_name', 'email', 'is_superuser']
+
+AddUserForm = modelform_factory(User,
+        fields=['username']+user_fields)
+EditUserForm = modelform_factory(User,
+        fields=user_fields)
 GroupForm = modelform_factory(Group,
         fields=['name'])
 TeamForm = modelform_factory(Team,
diff --git a/accounts/views.py b/accounts/views.py
index e7407a4..37068c6 100644
--- a/accounts/views.py
+++ b/accounts/views.py
@@ -52,8 +52,10 @@ def user_edit(request, user=None):
 
     if user:
         user = get_object_or_404(User, id=user)
+        form = EditUserForm(request.POST or None, instance=user)
+    else:
+        form = AddUserForm(request.POST or None)
 
-    form = UserForm(request.POST or None, instance=user)
     if request.method == 'POST' and form.is_valid():
         newuser = form.save()
         if user: