From 4e18c8a689b815451eec5ddbc205bf8cbde69ed0 Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Thu, 6 Nov 2025 11:41:20 -0500
Subject: [PATCH] refac

---
 .../components/admin/Users/UserList.svelte    | 20 +++++++++----------
 .../admin/Users/UserList/EditUserModal.svelte | 20 +++++++++++--------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/lib/components/admin/Users/UserList.svelte b/src/lib/components/admin/Users/UserList.svelte
index 219ad3a842..fba10f29f1 100644
--- a/src/lib/components/admin/Users/UserList.svelte
+++ b/src/lib/components/admin/Users/UserList.svelte
@@ -112,17 +112,6 @@
 	}}
 />
 
-{#key selectedUser}
-	<EditUserModal
-		bind:show={showEditUserModal}
-		{selectedUser}
-		sessionUser={$user}
-		on:save={async () => {
-			getUserList();
-		}}
-	/>
-{/key}
-
 <AddUserModal
 	bind:show={showAddUserModal}
 	on:save={async () => {
@@ -130,6 +119,15 @@
 	}}
 />
 
+<EditUserModal
+	bind:show={showEditUserModal}
+	{selectedUser}
+	sessionUser={$user}
+	on:save={async () => {
+		getUserList();
+	}}
+/>
+
 {#if selectedUser}
 	<UserChatsModal bind:show={showUserChatsModal} user={selectedUser} />
 {/if}
diff --git a/src/lib/components/admin/Users/UserList/EditUserModal.svelte b/src/lib/components/admin/Users/UserList/EditUserModal.svelte
index 7eedaa5618..9adbac0e4f 100644
--- a/src/lib/components/admin/Users/UserList/EditUserModal.svelte
+++ b/src/lib/components/admin/Users/UserList/EditUserModal.svelte
@@ -22,6 +22,18 @@
 	export let selectedUser;
 	export let sessionUser;
 
+	$: if (show) {
+		init();
+	}
+
+	const init = () => {
+		if (selectedUser) {
+			_user = selectedUser;
+			_user.password = '';
+			loadUserGroups();
+		}
+	};
+
 	let _user = {
 		profile_image_url: '',
 		role: 'pending',
@@ -52,14 +64,6 @@
 			return null;
 		});
 	};
-
-	onMount(() => {
-		if (selectedUser) {
-			_user = selectedUser;
-			_user.password = '';
-			loadUserGroups();
-		}
-	});
 </script>
 
 <Modal size="sm" bind:show>