diff --git a/src/lib/server/database.ts b/src/lib/server/database.ts
index a07887c..7e7a42f 100644
--- a/src/lib/server/database.ts
+++ b/src/lib/server/database.ts
@@ -512,7 +512,11 @@ export function updateUser(data: {id: number, gender?: string, name?: string, ad
 	const query = user_database.prepare(update_query)
 	const result = query.run(data)
 
-	return get_user_by_name(data?.name ?? "")	// GET USER BY lastRowId from result
+	const user_entry = get_user_entry_by_id(data.id)
+	if (!user_entry) {
+		throw new Error("Failed to retrieve updated user")
+	}
+	return new User(user_entry, new Database(get_user_db_name(data.id), { create: false, strict: true }) )	// Database should already exist
 }
 
 export function update_user_password(user_id: number, password: string) {