diff --git a/packages/builder/src/components/backend/DataTable/Table.svelte b/packages/builder/src/components/backend/DataTable/Table.svelte
index 6555197cb2..40a5d1dbac 100644
--- a/packages/builder/src/components/backend/DataTable/Table.svelte
+++ b/packages/builder/src/components/backend/DataTable/Table.svelte
@@ -47,6 +47,8 @@
       })
       schema.email.displayName = "Email"
       schema.roleId.displayName = "Role"
+      schema.firstName.displayName = "First Name"
+      schema.lastName.displayName = "Last Name"
       if (schema.status) {
         schema.status.displayName = "Status"
       }
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
index 11210db49f..bf1030dc2c 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
@@ -32,6 +32,8 @@
     delete customSchema["email"]
     delete customSchema["roleId"]
     delete customSchema["status"]
+    delete customSchema["firstName"]
+    delete customSchema["lastName"]
     return Object.entries(customSchema)
   }
 
@@ -87,6 +89,14 @@
     meta={{ name: "password", type: "password" }}
     bind:value={row.password}
   />
+  <RowFieldControl
+    meta={{ ...tableSchema.firstName, name: "First Name" }}
+    bind:value={row.firstName}
+  />
+  <RowFieldControl
+    meta={{ ...tableSchema.lastName, name: "Last Name" }}
+    bind:value={row.lastName}
+  />
   <!-- Defer rendering this select until roles load, otherwise the initial
        selection is always undefined -->
   <Select