diff --git a/packages/builder/src/components/backend/DataTable/DataTable.svelte b/packages/builder/src/components/backend/DataTable/DataTable.svelte
index 2869b82e70..5ff7925c5f 100644
--- a/packages/builder/src/components/backend/DataTable/DataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/DataTable.svelte
@@ -8,10 +8,13 @@
   import * as api from "./api"
   import Table from "./Table.svelte"
   import { TableNames } from "constants"
+  import CreateEditUser from "./modals/CreateEditUser.svelte"
+  import CreateEditRow from "./modals/CreateEditRow.svelte"
 
   let data = []
   let loading = false
 
+  $: isUsersTable = $backendUiStore.selectedTable?._id === TableNames.USERS
   $: title = $backendUiStore.selectedTable.name
   $: schema = $backendUiStore.selectedTable.schema
   $: tableView = {
@@ -31,14 +34,21 @@
   }
 </script>
 
-<Table {title} {schema} {data} allowEditing={true} {loading}>
+<Table
+  {title}
+  {schema}
+  tableId={$backendUiStore.selectedTable?._id}
+  {data}
+  allowEditing={true}
+  {loading}>
   <CreateColumnButton />
   {#if schema && Object.keys(schema).length > 0}
-    <CreateRowButton />
+    <CreateRowButton
+      modalContentComponent={isUsersTable ? CreateEditUser : CreateEditRow} />
     <CreateViewButton />
     <ExportButton view={tableView} />
   {/if}
-  {#if $backendUiStore.selectedTable?._id === TableNames.USERS}
+  {#if isUsersTable}
     <EditRolesButton />
   {/if}
 </Table>
diff --git a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
index 8b1c2e18e6..bddb66e4c9 100644
--- a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
+++ b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
@@ -7,20 +7,16 @@
     Toggle,
     RichText,
   } from "@budibase/bbui"
-  import { backendUiStore } from "builderStore"
-  import { TableNames } from "constants"
   import Dropzone from "components/common/Dropzone.svelte"
   import { capitalise } from "../../../helpers"
   import LinkedRowSelector from "components/common/LinkedRowSelector.svelte"
 
   export let meta
-  export let creating
   export let value = meta.type === "boolean" ? false : ""
+  export let readonly
 
   $: type = meta.type
   $: label = capitalise(meta.name)
-  $: editingUser =
-    !creating && $backendUiStore.selectedTable?._id === TableNames.USERS
 </script>
 
 {#if type === 'options'}
@@ -53,5 +49,5 @@
     data-cy="{meta.name}-input"
     {type}
     bind:value
-    disabled={editingUser} />
+    disabled={readonly} />
 {/if}
diff --git a/packages/builder/src/components/backend/DataTable/Table.svelte b/packages/builder/src/components/backend/DataTable/Table.svelte
index 2599e4f8b0..67fc417191 100644
--- a/packages/builder/src/components/backend/DataTable/Table.svelte
+++ b/packages/builder/src/components/backend/DataTable/Table.svelte
@@ -7,10 +7,15 @@
   import { notifier } from "builderStore/store/notifications"
   import Spinner from "components/common/Spinner.svelte"
   import DeleteRowsButton from "./buttons/DeleteRowsButton.svelte"
-  import { getRenderer, editRowRenderer } from "./cells/cellRenderers"
+  import {
+    getRenderer,
+    editRowRenderer,
+    userRowRenderer,
+  } from "./cells/cellRenderers"
   import TableLoadingOverlay from "./TableLoadingOverlay"
   import TableHeader from "./TableHeader"
   import "@budibase/svelte-ag-grid/dist/index.css"
+  import { TableNames } from "constants"
 
   export let schema = {}
   export let data = []
@@ -42,6 +47,14 @@
     animateRows: true,
   }
 
+  $: isUsersTable = tableId === TableNames.USERS
+  $: {
+    if (isUsersTable) {
+      schema.username.displayFieldName = "Username"
+      schema.roleId.displayFieldName = "Role"
+    }
+  }
+
   $: {
     let result = []
     if (allowEditing) {
@@ -57,12 +70,12 @@
           suppressMenu: true,
           minWidth: 114,
           width: 114,
-          cellRenderer: editRowRenderer,
+          cellRenderer: isUsersTable ? userRowRenderer : editRowRenderer,
         },
       ]
     }
 
-    Object.keys(schema || {}).forEach((key, idx) => {
+    Object.entries(schema || {}).forEach(([key, value]) => {
       result.push({
         headerCheckboxSelection: false,
         headerComponent: TableHeader,
@@ -70,7 +83,7 @@
           field: schema[key],
           editable: allowEditing,
         },
-        headerName: key,
+        headerName: value.displayFieldName || key,
         field: key,
         sortable: true,
         cellRenderer: getRenderer(schema[key], true),
diff --git a/packages/builder/src/components/backend/DataTable/buttons/CreateRowButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/CreateRowButton.svelte
index 3c0444881f..dfd8e6f4ac 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/CreateRowButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/CreateRowButton.svelte
@@ -1,6 +1,8 @@
 <script>
   import { TextButton as Button, Icon, Modal } from "@budibase/bbui"
-  import CreateEditRowModal from "../modals/CreateEditRowModal.svelte"
+  import CreateEditRow from "../modals/CreateEditRow.svelte"
+
+  export let modalContentComponent = CreateEditRow
 
   let modal
 </script>
@@ -12,5 +14,5 @@
   </Button>
 </div>
 <Modal bind:this={modal}>
-  <CreateEditRowModal />
+  <svelte:component this={modalContentComponent} />
 </Modal>
diff --git a/packages/builder/src/components/backend/DataTable/cells/cellRenderers.js b/packages/builder/src/components/backend/DataTable/cells/cellRenderers.js
index 209f23119f..f3a7b86740 100644
--- a/packages/builder/src/components/backend/DataTable/cells/cellRenderers.js
+++ b/packages/builder/src/components/backend/DataTable/cells/cellRenderers.js
@@ -1,5 +1,6 @@
 import AttachmentList from "./AttachmentCell.svelte"
 import EditRow from "../modals/EditRow.svelte"
+import CreateEditUser from "../modals/CreateEditUser.svelte"
 import DeleteRow from "../modals/DeleteRow.svelte"
 import RelationshipDisplay from "./RelationshipCell.svelte"
 
@@ -45,6 +46,23 @@ export function editRowRenderer(params) {
   return container
 }
 
+export function userRowRenderer(params) {
+  const container = document.createElement("div")
+  container.style.height = "100%"
+  container.style.display = "flex"
+  container.style.alignItems = "center"
+
+  new EditRow({
+    target: container,
+    props: {
+      row: params.data,
+      modalContentComponent: CreateEditUser,
+    },
+  })
+
+  return container
+}
+
 /* eslint-disable no-unused-vars */
 function attachmentRenderer(options, constraints, editable) {
   return params => {
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditRowModal.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
similarity index 81%
rename from packages/builder/src/components/backend/DataTable/modals/CreateEditRowModal.svelte
rename to packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
index e99c5762d8..050c7ce200 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditRowModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
@@ -1,6 +1,5 @@
 <script>
   import { backendUiStore } from "builderStore"
-  import { TableNames } from "constants"
   import { notifier } from "builderStore/store/notifications"
   import RowFieldControl from "../RowFieldControl.svelte"
   import * as api from "../api"
@@ -40,15 +39,9 @@
   confirmText={creating ? 'Create Row' : 'Save Row'}
   onConfirm={saveRow}>
   <ErrorsBox {errors} />
-  {#if creating && table._id === TableNames.USERS}
-    <RowFieldControl
-      {creating}
-      meta={{ name: 'password', type: 'password' }}
-      bind:value={row.password} />
-  {/if}
   {#each tableSchema as [key, meta]}
     <div>
-      <RowFieldControl {meta} bind:value={row[key]} {creating} />
+      <RowFieldControl {meta} bind:value={row[key]} />
     </div>
   {/each}
 </ModalContent>
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
new file mode 100644
index 0000000000..2f6f9a7e8c
--- /dev/null
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
@@ -0,0 +1,101 @@
+<script>
+  import { onMount } from "svelte"
+  import { backendUiStore } from "builderStore"
+  import { notifier } from "builderStore/store/notifications"
+  import RowFieldControl from "../RowFieldControl.svelte"
+  import * as backendApi from "../api"
+  import builderApi from "builderStore/api"
+  import { ModalContent, Select } from "@budibase/bbui"
+  import ErrorsBox from "components/common/ErrorsBox.svelte"
+
+  export let row = {}
+
+  let errors = []
+  let roles = []
+  let rolesLoaded = false
+
+  $: creating = row?._id == null
+  $: table = row.tableId
+    ? $backendUiStore.tables.find(table => table._id === row?.tableId)
+    : $backendUiStore.selectedTable
+  $: tableSchema = getUserSchema(table)
+  $: customSchemaKeys = getCustomSchemaKeys(tableSchema)
+
+  const getUserSchema = table => {
+    let schema = table?.schema ?? {}
+    if (schema.username) {
+      schema.username.name = "Username"
+    }
+    return schema
+  }
+
+  const getCustomSchemaKeys = schema => {
+    let customSchema = { ...schema }
+    delete customSchema["username"]
+    delete customSchema["roleId"]
+    return Object.entries(customSchema)
+  }
+
+  const saveRow = async () => {
+    const rowResponse = await backendApi.saveRow(
+      { ...row, tableId: table._id },
+      table._id
+    )
+
+    if (rowResponse.errors) {
+      if (Array.isArray(rowResponse.errors)) {
+        errors = rowResponse.errors.map(error => ({ message: error }))
+      } else {
+        errors = Object.entries(rowResponse.errors)
+          .map(([key, error]) => ({ dataPath: key, message: error }))
+          .flat()
+      }
+      return false
+    }
+
+    notifier.success("User saved successfully.")
+    backendUiStore.actions.rows.save(rowResponse)
+  }
+
+  const fetchRoles = async () => {
+    const rolesResponse = await builderApi.get("/api/roles")
+    roles = await rolesResponse.json()
+    rolesLoaded = true
+  }
+
+  onMount(fetchRoles)
+</script>
+
+<ModalContent
+  title={creating ? 'Create User' : 'Edit User'}
+  confirmText={creating ? 'Create User' : 'Save User'}
+  onConfirm={saveRow}>
+  <ErrorsBox {errors} />
+  <RowFieldControl
+    meta={{ ...tableSchema.username, name: 'Username' }}
+    bind:value={row.username}
+    readonly={!creating} />
+  {#if creating}
+    <RowFieldControl
+      meta={{ name: 'password', type: 'password' }}
+      bind:value={row.password} />
+  {/if}
+  <!-- Defer rendering this select until roles load, otherwise the initial
+       selection is always undefined -->
+  {#if rolesLoaded}
+    <Select
+      thin
+      secondary
+      label="Role"
+      data-cy="roleId-select"
+      bind:value={row.roleId}>
+      <option value="">Choose an option</option>
+      {#each roles as role}
+        <option value={role._id}>{role.name}</option>
+      {/each}
+    </Select>
+  {/if}
+  {#each customSchemaKeys as [key, meta]}
+    <RowFieldControl {meta} bind:value={row[key]} {creating} />
+  {/each}
+</ModalContent>
diff --git a/packages/builder/src/components/backend/DataTable/modals/EditRow.svelte b/packages/builder/src/components/backend/DataTable/modals/EditRow.svelte
index a4d2a74fc2..5d858a50f4 100644
--- a/packages/builder/src/components/backend/DataTable/modals/EditRow.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/EditRow.svelte
@@ -1,8 +1,9 @@
 <script>
   import { Modal, Button } from "@budibase/bbui"
-  import CreateEditRowModal from "../modals/CreateEditRowModal.svelte"
+  import CreateEditRow from "../modals/CreateEditRow.svelte"
 
   export let row
+  export let modalContentComponent = CreateEditRow
 
   let modal
 
@@ -14,5 +15,5 @@
 
 <Button data-cy="edit-row" secondary small on:click={showModal}>Edit</Button>
 <Modal bind:this={modal}>
-  <CreateEditRowModal {row} />
+  <svelte:component this={modalContentComponent} {row} />
 </Modal>