diff --git a/atst/forms/member.py b/atst/forms/member.py
new file mode 100644
index 00000000..aca653e5
--- /dev/null
+++ b/atst/forms/member.py
@@ -0,0 +1,27 @@
+from flask_wtf import FlaskForm
+from wtforms.fields.html5 import EmailField, TelField
+from wtforms.validators import Required, Email, Length, Optional
+from wtforms.fields import StringField
+
+from atst.forms.validators import IsNumber, PhoneNumber
+from atst.utils.localization import translate
+
+
+class NewForm(FlaskForm):
+    first_name = StringField(
+        label=translate("forms.new_member.first_name_label"), validators=[Required()]
+    )
+    last_name = StringField(
+        label=translate("forms.new_member.last_name_label"), validators=[Required()]
+    )
+    email = EmailField(
+        translate("forms.new_member.email_label"), validators=[Required(), Email()]
+    )
+    phone_number = TelField(
+        translate("forms.new_member.phone_number_label"),
+        validators=[Optional(), PhoneNumber()],
+    )
+    dod_id = StringField(
+        translate("forms.new_member.dod_id_label"),
+        validators=[Required(), Length(min=10), IsNumber()],
+    )
diff --git a/atst/forms/portfolio_member.py b/atst/forms/portfolio_member.py
index 2e76efdd..2a59848f 100644
--- a/atst/forms/portfolio_member.py
+++ b/atst/forms/portfolio_member.py
@@ -1,10 +1,9 @@
-from wtforms.fields.html5 import EmailField, TelField
-from wtforms.validators import Required, Email, Length, Optional
+from wtforms.validators import Required
 from wtforms.fields import StringField, FormField, FieldList, HiddenField
 
 from atst.domain.permission_sets import PermissionSets
 from .forms import BaseForm
-from atst.forms.validators import IsNumber, PhoneNumber
+from .member import NewForm as BaseNewMemberForm
 from atst.forms.fields import SelectField
 from atst.utils.localization import translate
 
@@ -62,24 +61,16 @@ class EditForm(PermissionsForm):
     pass
 
 
-class NewForm(PermissionsForm):
-    first_name = StringField(
-        label=translate("forms.new_member.first_name_label"), validators=[Required()]
-    )
-    last_name = StringField(
-        label=translate("forms.new_member.last_name_label"), validators=[Required()]
-    )
-    email = EmailField(
-        translate("forms.new_member.email_label"), validators=[Required(), Email()]
-    )
-    phone_number = TelField(
-        translate("forms.new_member.phone_number_label"),
-        validators=[Optional(), PhoneNumber()],
-    )
-    dod_id = StringField(
-        translate("forms.new_member.dod_id_label"),
-        validators=[Required(), Length(min=10), IsNumber()],
-    )
+class NewForm(BaseForm):
+    user_data = FormField(BaseNewMemberForm)
+    permission_sets = FormField(PermissionsForm)
+
+    @property
+    def update_data(self):
+        return {
+            "permission_sets": self.data.get("permission_sets").get("permission_sets"),
+            **self.data.get("user_data"),
+        }
 
 
 class AssignPPOCForm(PermissionsForm):
diff --git a/atst/routes/portfolios/members.py b/atst/routes/portfolios/members.py
index 573781b8..f25f0918 100644
--- a/atst/routes/portfolios/members.py
+++ b/atst/routes/portfolios/members.py
@@ -34,9 +34,9 @@ def create_member(portfolio_id):
 
     if form.validate():
         try:
-            member = Portfolios.create_member(portfolio, form.data)
+            member = Portfolios.create_member(portfolio, form.update_data)
             invite_service = InvitationService(
-                g.current_user, member, form.data.get("email")
+                g.current_user, member, form.update_data.get("email")
             )
             invite_service.invite()
 
diff --git a/templates/fragments/admin/add_new_portfolio_member.html b/templates/fragments/admin/add_new_portfolio_member.html
index a8c91a7a..2fd166e9 100644
--- a/templates/fragments/admin/add_new_portfolio_member.html
+++ b/templates/fragments/admin/add_new_portfolio_member.html
@@ -21,23 +21,23 @@
   </div>
   <div class='form-row'>
     <div class='form-col form-col--half'>
-      {{ TextInput(member_form.first_name, validation='requiredField') }}
+      {{ TextInput(member_form.user_data.first_name, validation='requiredField') }}
     </div>
     <div class='form-col form-col--half'>
-      {{ TextInput(member_form.last_name, validation='requiredField') }}
+      {{ TextInput(member_form.user_data.last_name, validation='requiredField') }}
     </div>
   </div>
   <div class='form-row'>
     <div class='form-col form-col--half'>
-      {{ TextInput(member_form.email, validation='email') }}
+      {{ TextInput(member_form.user_data.email, validation='email') }}
     </div>
     <div class='form-col form-col--half'>
-      {{ TextInput(member_form.phone_number, validation='usPhone', optional=True) }}
+      {{ TextInput(member_form.user_data.phone_number, validation='usPhone', optional=True) }}
     </div>
   </div>
   <div class='form-row'>
     <div class='form-col form-col--half'>
-      {{ TextInput(member_form.dod_id, validation='dodId') }}
+      {{ TextInput(member_form.user_data.dod_id, validation='dodId') }}
     </div>
     <div class='form-col form-col--half'>
     </div>
@@ -61,10 +61,10 @@
         {{ "portfolios.admin.permissions_info" | translate }}
       </a>
     </div>
-    {{ SimpleOptionsInput(member_form.perms_app_mgmt) }}
-    {{ SimpleOptionsInput(member_form.perms_funding) }}
-    {{ SimpleOptionsInput(member_form.perms_reporting) }}
-    {{ SimpleOptionsInput(member_form.perms_portfolio_mgmt) }}
+    {{ SimpleOptionsInput(member_form.permission_sets.perms_app_mgmt) }}
+    {{ SimpleOptionsInput(member_form.permission_sets.perms_funding) }}
+    {{ SimpleOptionsInput(member_form.permission_sets.perms_reporting) }}
+    {{ SimpleOptionsInput(member_form.permission_sets.perms_portfolio_mgmt) }}
     <div class='action-group'>
       <input
         type="submit"
diff --git a/tests/routes/portfolios/test_invitations.py b/tests/routes/portfolios/test_invitations.py
index 78eb1e77..1f07a3e2 100644
--- a/tests/routes/portfolios/test_invitations.py
+++ b/tests/routes/portfolios/test_invitations.py
@@ -49,11 +49,14 @@ def test_new_member_accepts_valid_invite(monkeypatch, client, user_session):
     response = client.post(
         url_for("portfolios.create_member", portfolio_id=portfolio.id),
         data={
-            "perms_app_mgmt": PermissionSets.VIEW_PORTFOLIO_APPLICATION_MANAGEMENT,
-            "perms_funding": PermissionSets.VIEW_PORTFOLIO_FUNDING,
-            "perms_reporting": PermissionSets.VIEW_PORTFOLIO_REPORTS,
-            "perms_portfolio_mgmt": PermissionSets.VIEW_PORTFOLIO_ADMIN,
-            **user_info,
+            "permission_sets-perms_app_mgmt": PermissionSets.VIEW_PORTFOLIO_APPLICATION_MANAGEMENT,
+            "permission_sets-perms_funding": PermissionSets.VIEW_PORTFOLIO_FUNDING,
+            "permission_sets-perms_reporting": PermissionSets.VIEW_PORTFOLIO_REPORTS,
+            "permission_sets-perms_portfolio_mgmt": PermissionSets.VIEW_PORTFOLIO_ADMIN,
+            "user_data-first_name": user_info["first_name"],
+            "user_data-last_name": user_info["last_name"],
+            "user_data-dod_id": user_info["dod_id"],
+            "user_data-email": user_info["email"],
         },
     )
 
diff --git a/tests/routes/portfolios/test_members.py b/tests/routes/portfolios/test_members.py
index b3f8c430..d2c4ec67 100644
--- a/tests/routes/portfolios/test_members.py
+++ b/tests/routes/portfolios/test_members.py
@@ -5,10 +5,10 @@ from atst.domain.permission_sets import PermissionSets
 from atst.queue import queue
 
 _DEFAULT_PERMS_FORM_DATA = {
-    "perms_app_mgmt": PermissionSets.VIEW_PORTFOLIO_APPLICATION_MANAGEMENT,
-    "perms_funding": PermissionSets.VIEW_PORTFOLIO_FUNDING,
-    "perms_reporting": PermissionSets.VIEW_PORTFOLIO_REPORTS,
-    "perms_portfolio_mgmt": PermissionSets.VIEW_PORTFOLIO_ADMIN,
+    "permission_sets-perms_app_mgmt": PermissionSets.VIEW_PORTFOLIO_APPLICATION_MANAGEMENT,
+    "permission_sets-perms_funding": PermissionSets.VIEW_PORTFOLIO_FUNDING,
+    "permission_sets-perms_reporting": PermissionSets.VIEW_PORTFOLIO_REPORTS,
+    "permission_sets-perms_portfolio_mgmt": PermissionSets.VIEW_PORTFOLIO_ADMIN,
 }
 
 
@@ -32,11 +32,11 @@ def test_create_member(client, user_session):
     response = client.post(
         url_for("portfolios.create_member", portfolio_id=portfolio.id),
         data={
-            "dod_id": user.dod_id,
-            "first_name": "Wilbur",
-            "last_name": "Zuckerman",
-            "email": "some_pig@zuckermans.com",
-            "portfolio_role": "developer",
+            "user_data-dod_id": user.dod_id,
+            "user_data-first_name": "user_data-Wilbur",
+            "user_data-last_name": "user_data-Zuckerman",
+            "user_data-email": "user_data-some_pig@zuckermans.com",
+            "user_data-portfolio_role": "user_data-developer",
             **_DEFAULT_PERMS_FORM_DATA,
         },
         follow_redirects=True,