diff --git a/packages/builder/cypress/integration/createUser.spec.js b/packages/builder/cypress/integration/createUser.spec.js
index b1f737068b..ca2fa225da 100644
--- a/packages/builder/cypress/integration/createUser.spec.js
+++ b/packages/builder/cypress/integration/createUser.spec.js
@@ -9,9 +9,9 @@ context('Create a User', () => {
 
     // https://on.cypress.io/interacting-with-elements
     it('should create a user', () => {
-        cy.createUser('bbuser', 'test', 'POWER_USER')
+        cy.addRow(["Users", "bbuser", "test", "POWER_USER"])
 
-        // Check to make sure user was created!
-        cy.get("input[disabled]").should('have.value', 'bbuser')
+        // // Check to make sure user was created!
+        // cy.get("input[disabled]").should('have.value', 'bbuser')
     })
 })
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index e9b461cff0..ee72b36053 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -31,7 +31,9 @@
     table => table._id !== $backendUiStore.draftTable._id
   )
   $: required = !!field?.constraints?.presence || primaryDisplay
-  $: uneditable = $backendUiStore.selectedTable?._id === TableNames.USERS && UNEDITABLE_USER_FIELDS.includes(field.name) 
+  $: uneditable =
+    $backendUiStore.selectedTable?._id === TableNames.USERS &&
+    UNEDITABLE_USER_FIELDS.includes(field.name)
 
   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 4ca4a7fd9f..460c04428e 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditRowModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditRowModal.svelte
@@ -41,7 +41,9 @@
   onConfirm={saveRow}>
   <ErrorsBox {errors} />
   {#if creating && table._id === TableNames.USERS}
-      <RowFieldControl meta={{ name: "password", type: "password" }} bind:value={row.password} />
+    <RowFieldControl
+      meta={{ name: 'password', type: 'password' }}
+      bind:value={row.password} />
   {/if}
   {#each tableSchema as [key, meta]}
     <div>
diff --git a/packages/builder/src/components/settings/SettingsModal.svelte b/packages/builder/src/components/settings/SettingsModal.svelte
index 44ab581521..9b83b506ba 100644
--- a/packages/builder/src/components/settings/SettingsModal.svelte
+++ b/packages/builder/src/components/settings/SettingsModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { General, Users, DangerZone, APIKeys } from "./tabs"
+  import { General, DangerZone, APIKeys } from "./tabs"
   import { Switcher, ModalContent } from "@budibase/bbui"
 
   const tabs = [
@@ -8,11 +8,6 @@
       key: "GENERAL",
       component: General,
     },
-    {
-      title: "Users",
-      key: "USERS",
-      component: Users,
-    },
     {
       title: "API Keys",
       key: "API_KEYS",
diff --git a/packages/builder/src/components/settings/UserRow.svelte b/packages/builder/src/components/settings/UserRow.svelte
deleted file mode 100644
index 30b03d9755..0000000000
--- a/packages/builder/src/components/settings/UserRow.svelte
+++ /dev/null
@@ -1,43 +0,0 @@
-<script>
-  import { createEventDispatcher } from "svelte"
-  const dispatch = createEventDispatcher()
-  import { Input, Select, Button } from "@budibase/bbui"
-  export let user
-
-  let editMode = false
-</script>
-
-<div class="inputs">
-  <Input
-    disabled
-    thin
-    bind:value={user.username}
-    name="Name"
-    placeholder="Username" />
-  <Select disabled={!editMode} bind:value={user.accessLevelId} thin secondary>
-    <option value="">Choose an option</option>
-    <option value="ADMIN">Admin</option>
-    <option value="POWER_USER">Power User</option>
-  </Select>
-  {#if editMode}
-    <Button
-      blue
-      on:click={() => {
-        dispatch('save', user)
-        editMode = false
-      }}>
-      Save
-    </Button>
-  {:else}
-    <Button secondary on:click={() => (editMode = true)}>Edit</Button>
-  {/if}
-</div>
-
-<style>
-  .inputs {
-    display: grid;
-    justify-items: stretch;
-    grid-gap: var(--spacing-m);
-    grid-template-columns: 1fr 1fr 140px;
-  }
-</style>
diff --git a/packages/builder/src/components/settings/tabs/Users.svelte b/packages/builder/src/components/settings/tabs/Users.svelte
deleted file mode 100644
index 9ef5a86235..0000000000
--- a/packages/builder/src/components/settings/tabs/Users.svelte
+++ /dev/null
@@ -1,113 +0,0 @@
-<script>
-  import { Input, Select, Button, Label } from "@budibase/bbui"
-  import UserRow from "../UserRow.svelte"
-
-  import { store, backendUiStore } from "builderStore"
-  import api from "builderStore/api"
-
-  let username = ""
-  let password = ""
-  let accessLevelId = "ADMIN"
-
-  $: valid = username && password && accessLevelId
-  $: appId = $store.appId
-
-  // Create user!
-  async function createUser() {
-    if (valid) {
-      const user = { name: username, username, password, accessLevelId }
-      const response = await api.post(`/api/users`, user)
-      const json = await response.json()
-      backendUiStore.actions.users.create(json)
-      fetchUsersPromise = fetchUsers()
-    }
-  }
-
-  // Update user!
-  async function updateUser(event) {
-    let data = event.detail
-    delete data.password
-    const response = await api.put(`/api/users`, data)
-    const users = await response.json()
-    backendUiStore.update(state => {
-      state.users = users
-      return state
-    })
-    fetchUsersPromise = fetchUsers()
-  }
-
-  // Get users
-  async function fetchUsers() {
-    const response = await api.get(`/api/users`)
-    const users = await response.json()
-    backendUiStore.update(state => {
-      state.users = users
-      return state
-    })
-    return users
-  }
-
-  let fetchUsersPromise = fetchUsers()
-</script>
-
-<div class="container">
-  <div>
-    <Label extraSmall grey>Create New User</Label>
-    <div class="inputs">
-      <Input thin bind:value={username} name="Name" placeholder="Username" />
-      <Input
-        thin
-        type="password"
-        bind:value={password}
-        name="Password"
-        placeholder="Password" />
-      <Select secondary bind:value={accessLevelId} thin>
-        <option value="">Choose an option</option>
-        <option value="ADMIN">Admin</option>
-        <option value="POWER_USER">Power User</option>
-      </Select>
-      <Button on:click={createUser} primary>Create</Button>
-    </div>
-  </div>
-  <div>
-    <Label extraSmall grey>Current Users</Label>
-    {#await fetchUsersPromise}
-      Loading...
-    {:then users}
-      <ul>
-        {#each users as user}
-          <li>
-            <UserRow {user} on:save={updateUser} />
-          </li>
-        {:else}
-          <li>No Users found</li>
-        {/each}
-      </ul>
-    {:catch err}
-      Something went wrong when trying to fetch users. Please refresh (CMD + R /
-      CTRL + R) the page and try again.
-    {/await}
-  </div>
-</div>
-
-<style>
-  .container {
-    display: grid;
-    grid-gap: var(--spacing-xl);
-  }
-
-  .inputs {
-    display: grid;
-    justify-items: stretch;
-    grid-gap: var(--spacing-m);
-    grid-template-columns: 1fr 1fr 1fr 140px;
-  }
-
-  ul {
-    list-style: none;
-    padding: 0;
-    display: grid;
-    grid-gap: var(--spacing-m);
-    margin: 0;
-  }
-</style>
diff --git a/packages/server/src/api/controllers/user.js b/packages/server/src/api/controllers/user.js
index 0be16c32bc..f67ae72a89 100644
--- a/packages/server/src/api/controllers/user.js
+++ b/packages/server/src/api/controllers/user.js
@@ -11,7 +11,7 @@ const {
 exports.fetch = async function(ctx) {
   const database = new CouchDB(ctx.user.appId)
   const data = await database.allDocs(
-    getUserParams(null, {
+    getUserParams("", {
       include_docs: true,
     })
   )
diff --git a/packages/server/src/db/utils.js b/packages/server/src/db/utils.js
index 767e892c17..96fd92218e 100644
--- a/packages/server/src/db/utils.js
+++ b/packages/server/src/db/utils.js
@@ -101,8 +101,12 @@ exports.generateRowID = tableId => {
 /**
  * Gets parameters for retrieving users, this is a utility function for the getDocParams function.
  */
-exports.getUserParams = (username = null, otherProps = {}) => {
-  return getDocParams(DocumentTypes.USER, username, otherProps)
+exports.getUserParams = (username = "", otherProps = {}) => {
+  return getDocParams(
+    DocumentTypes.ROW,
+    `${ViewNames.USERS}${SEPARATOR}${DocumentTypes.USER}${SEPARATOR}${username}`,
+    otherProps
+  )
 }
 
 /**