diff --git a/packages/builder/src/pages/portal/manage/oauth/logos/Google.svelte b/packages/builder/src/pages/portal/manage/oauth/_logos/Google.svelte
similarity index 100%
rename from packages/builder/src/pages/portal/manage/oauth/logos/Google.svelte
rename to packages/builder/src/pages/portal/manage/oauth/_logos/Google.svelte
diff --git a/packages/builder/src/pages/portal/manage/oauth/index.svelte b/packages/builder/src/pages/portal/manage/oauth/index.svelte
index 45c9761d38..f9d2c49cfd 100644
--- a/packages/builder/src/pages/portal/manage/oauth/index.svelte
+++ b/packages/builder/src/pages/portal/manage/oauth/index.svelte
@@ -1,5 +1,5 @@
 <script>
-  import GoogleLogo from "./logos/Google.svelte"
+  import GoogleLogo from "./_logos/Google.svelte"
   import {
     Button,
     Heading,
diff --git a/packages/builder/src/pages/portal/manage/users/_components/AddUserModal.svelte b/packages/builder/src/pages/portal/manage/users/_components/AddUserModal.svelte
new file mode 100644
index 0000000000..572a18cedb
--- /dev/null
+++ b/packages/builder/src/pages/portal/manage/users/_components/AddUserModal.svelte
@@ -0,0 +1,22 @@
+<script>
+  import { Body, Input, Select, ModalContent } from "@budibase/bbui"
+
+  const options = ["Email onboarding", "Basic onboarding"]
+  let selected = options[0]
+</script>
+
+<ModalContent
+  size="M"
+  title="Add new user options"
+  confirmText="Add user"
+  cancelText="Cancel"
+  showCloseIcon={false}
+>
+  <Body noPadding
+    >If you have SMTP configured and an email for the new user, you can use the
+    automated email onboarding flow. Otherwise, use our basic onboarding process
+    with autogenerated passwords.</Body
+  >
+  <Select bind:value={selected} label="Add new user via:" {options} />
+  <Input label="Email" />
+</ModalContent>
diff --git a/packages/builder/src/pages/portal/manage/users/index.svelte b/packages/builder/src/pages/portal/manage/users/index.svelte
index a968d78003..4d67dabc0c 100644
--- a/packages/builder/src/pages/portal/manage/users/index.svelte
+++ b/packages/builder/src/pages/portal/manage/users/index.svelte
@@ -9,7 +9,22 @@
     Table,
     Label,
     Layout,
+    Modal,
+    ModalContent,
   } from "@budibase/bbui"
+  import AddUserModal from "./_components/AddUserModal.svelte"
+  import { users } from "stores/portal"
+
+  users.init()
+
+  const schema = {
+    email: {},
+    status: {},
+    // access: {},
+    // group: {}
+  }
+
+  export let modal
 </script>
 
 <Layout>
@@ -31,14 +46,22 @@
     </div>
     <div class="buttons">
       <ButtonGroup>
-        <Button secondary>Import users</Button>
-        <Button overBackground>Add user</Button>
+        <Button tooltip="Coming soon." disabled secondary>Import users</Button>
+        <Button overBackground on:click={modal.show}>Add user</Button>
       </ButtonGroup>
     </div>
-    <Table schema />
+    <Table
+      {schema}
+      data={$users}
+      allowEditColumns={false}
+      allowEditRows={false}
+      allowSelectRows={false}
+    />
   </div>
 </Layout>
 
+<Modal bind:this={modal}><AddUserModal /></Modal>
+
 <style>
   .users {
     position: relative;
diff --git a/packages/builder/src/stores/portal/index.js b/packages/builder/src/stores/portal/index.js
index 5aba1c2731..d4b6462806 100644
--- a/packages/builder/src/stores/portal/index.js
+++ b/packages/builder/src/stores/portal/index.js
@@ -1,2 +1,3 @@
 export { organisation } from "./organisation"
+export { users } from "./users"
 export { admin } from "./admin"
diff --git a/packages/builder/src/stores/portal/users.js b/packages/builder/src/stores/portal/users.js
new file mode 100644
index 0000000000..94b6474a68
--- /dev/null
+++ b/packages/builder/src/stores/portal/users.js
@@ -0,0 +1,32 @@
+import { writable } from "svelte/store"
+import api from "builderStore/api"
+
+export function createUsersStore() {
+  const { subscribe, set } = writable({})
+
+  async function init() {
+    try {
+      const response = await api.get(`/api/admin/users`)
+      const json = await response.json()
+      set(json)
+    } catch (error) {
+      console.log(error)
+    }
+  }
+
+  return {
+    subscribe,
+    // save: async config => {
+    //   try {
+    //     await api.post("/api/admin/configs", { type: "settings", config })
+    //     await init()
+    //     return { status: 200 }
+    //   } catch (error) {
+    //     return { error }
+    //   }
+    // },
+    init,
+  }
+}
+
+export const users = createUsersStore()
