diff --git a/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte b/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte
index 1596577192..28d18b7047 100644
--- a/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte
+++ b/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte
@@ -108,8 +108,11 @@
       </div>
     </div>
     <div class="regenerate">
-      <ActionButton size="S" icon="Refresh" quiet
-        >Regenerate password</ActionButton
+      <ActionButton
+        size="S"
+        icon="Refresh"
+        quiet
+        on:click={resetPasswordModal.show}>Force password reset</ActionButton
       >
     </div>
   </div>
@@ -161,7 +164,10 @@
   />
 </Modal>
 <Modal bind:this={resetPasswordModal}>
-  <ForceResetPasswordModal user={$userFetch.data} />
+  <ForceResetPasswordModal
+    user={$userFetch.data}
+    on:update={userFetch.refresh}
+  />
 </Modal>
 
 <style>
diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/ForceResetPasswordModal.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/ForceResetPasswordModal.svelte
index 53799ac79a..d1a5559986 100644
--- a/packages/builder/src/pages/builder/portal/manage/users/_components/ForceResetPasswordModal.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/users/_components/ForceResetPasswordModal.svelte
@@ -1,17 +1,21 @@
 <script>
+  import { createEventDispatcher } from "svelte"
   import { ModalContent, Body, Input, notifications } from "@budibase/bbui"
   import { users } from "stores/portal"
 
+  const dispatch = createEventDispatcher()
+
   export let user
 
   const password = Math.random().toString(36).substr(2, 20)
 
   async function resetPassword() {
-    const res = await users.save.create({ ...user, password })
+    const res = await users.save({ ...user, password })
     if (res.status) {
       notifications.error(res.message)
     } else {
       notifications.success("Password reset.")
+      dispatch("update")
     }
   }
 </script>
diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/UpdateRolesModal.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/UpdateRolesModal.svelte
index 7c5500acd8..ba00eebc17 100644
--- a/packages/builder/src/pages/builder/portal/manage/users/_components/UpdateRolesModal.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/users/_components/UpdateRolesModal.svelte
@@ -1,7 +1,6 @@
 <script>
   import { createEventDispatcher } from "svelte"
   import { Body, Select, ModalContent, notifications } from "@budibase/bbui"
-  import { fetchData } from "helpers"
   import { users } from "stores/portal"
 
   export let app