diff --git a/app/access/forms/team_users.py b/app/access/forms/team_users.py
new file mode 100644
index 00000000..5252a57d
--- /dev/null
+++ b/app/access/forms/team_users.py
@@ -0,0 +1,16 @@
+from django import forms
+from django.db.models import Q
+
+from app import settings
+
+from access.models import TeamUsers
+
+
+class TeamUsersForm(forms.ModelForm):
+
+    class Meta:
+        model = TeamUsers
+        fields = [
+            'user',
+            'manager',
+        ]
diff --git a/app/access/views/user.py b/app/access/views/user.py
index 34238d3c..ffb5c3cd 100644
--- a/app/access/views/user.py
+++ b/app/access/views/user.py
@@ -3,23 +3,28 @@ from django.urls import reverse
 from django.utils.decorators import method_decorator
 from django.views import generic
 
+from access.forms.team_users import TeamUsersForm
 from access.mixin import OrganizationPermission
 from access.models import Team, TeamUsers
 
 
 
 class Add(OrganizationPermission, generic.CreateView):
+
+    context_object_name = "teamuser"
+
+    form_class = TeamUsersForm
+
     model = TeamUsers
-    parent_model = Team
+
+    parent_model = TeamUsers
+
     permission_required = [
         'access.view_team',
         'access.add_teamusers'
     ]
+
     template_name = 'form.html.j2'
-    fields = [
-        'user',
-        'manager'
-    ]
 
 
     def form_valid(self, form):