diff --git a/packages/builder/src/components/backend/DataTable/api.js b/packages/builder/src/components/backend/DataTable/api.js
index 496db35b3f..629405a9fc 100644
--- a/packages/builder/src/components/backend/DataTable/api.js
+++ b/packages/builder/src/components/backend/DataTable/api.js
@@ -7,8 +7,8 @@ export async function createUser(user) {
 }
 
 export async function saveRow(row, tableId) {
-  const SAVE_ROWS_URL = `/api/${tableId}/rows`
-  const response = await api.post(SAVE_ROWS_URL, row)
+  const SAVE_ROW_URL = `/api/${tableId}/rows`
+  const response = await api.post(SAVE_ROW_URL, row)
 
   return await response.json()
 }
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index 9c8e985ffd..e9b461cff0 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -32,11 +32,6 @@
   )
   $: required = !!field?.constraints?.presence || primaryDisplay
   $: uneditable = $backendUiStore.selectedTable?._id === TableNames.USERS && UNEDITABLE_USER_FIELDS.includes(field.name) 
-  $: {
-    console.log($backendUiStore.selectedTable)
-    console.log(field.name)
-    console.log(uneditable)
-  }
 
   async function saveColumn() {
     backendUiStore.update(state => {
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditRowModal.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditRowModal.svelte
index 2cc0113f55..4ca4a7fd9f 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditRowModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditRowModal.svelte
@@ -1,5 +1,6 @@
 <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"
@@ -21,9 +22,10 @@
       { ...row, tableId: table._id },
       table._id
     )
+
     if (rowResponse.errors) {
-      errors = Object.keys(rowResponse.errors)
-        .map(k => ({ dataPath: k, message: rowResponse.errors[k] }))
+      errors = Object.entries(rowResponse.errors)
+        .map(([key, error]) => ({ dataPath: key, message: error }))
         .flat()
       // Prevent modal closing if there were errors
       return false
@@ -38,6 +40,9 @@
   confirmText={creating ? 'Create Row' : 'Save Row'}
   onConfirm={saveRow}>
   <ErrorsBox {errors} />
+  {#if creating && table._id === TableNames.USERS}
+      <RowFieldControl meta={{ name: "password", type: "password" }} bind:value={row.password} />
+  {/if}
   {#each tableSchema as [key, meta]}
     <div>
       <RowFieldControl {meta} bind:value={row[key]} />
diff --git a/packages/builder/src/components/settings/tabs/Users.svelte b/packages/builder/src/components/settings/tabs/Users.svelte
index 3d4a44fc73..9ef5a86235 100644
--- a/packages/builder/src/components/settings/tabs/Users.svelte
+++ b/packages/builder/src/components/settings/tabs/Users.svelte
@@ -4,7 +4,6 @@
 
   import { store, backendUiStore } from "builderStore"
   import api from "builderStore/api"
-  // import * as api from "../api"
 
   let username = ""
   let password = ""
diff --git a/packages/server/src/api/controllers/row.js b/packages/server/src/api/controllers/row.js
index ccf26b02e2..c7fb70d50e 100644
--- a/packages/server/src/api/controllers/row.js
+++ b/packages/server/src/api/controllers/row.js
@@ -6,7 +6,9 @@ const {
   generateRowID,
   DocumentTypes,
   SEPARATOR,
+  ViewNames,
 } = require("../../db/utils")
+const usersController = require("./user")
 const { cloneDeep } = require("lodash")
 
 const TABLE_VIEW_BEGINS_WITH = `all${SEPARATOR}${DocumentTypes.TABLE}${SEPARATOR}`
@@ -118,6 +120,16 @@ exports.save = async function(ctx) {
     table,
   })
 
+  // Creation of a new user goes to the user controller
+  if (!existingRow && row.tableId === ViewNames.USERS) {
+    try {
+      await usersController.create(ctx)
+    } catch (err) {
+      ctx.body = { errors: [err.message] }
+    }
+    return
+  }
+
   if (existingRow) {
     const response = await db.put(row)
     row._rev = response.rev
@@ -315,8 +327,8 @@ exports.fetchEnrichedRow = async function(ctx) {
   ctx.status = 200
 }
 
-function coerceRowValues(rec, table) {
-  const row = cloneDeep(rec)
+function coerceRowValues(record, table) {
+  const row = cloneDeep(record)
   for (let [key, value] of Object.entries(row)) {
     const field = table.schema[key]
     if (!field) continue