diff --git a/src/api/client/user_directory.rs b/src/api/client/user_directory.rs
index 9a1f86b84..059adb224 100644
--- a/src/api/client/user_directory.rs
+++ b/src/api/client/user_directory.rs
@@ -6,6 +6,7 @@
 use futures::{FutureExt, StreamExt, pin_mut};
 use ruma::{
 	api::client::user_directory::search_users::{self},
+	assign,
 	events::room::join_rules::JoinRule,
 };
 
@@ -31,29 +32,25 @@ pub(crate) async fn search_users_route(
 		.min(LIMIT_MAX);
 
 	let search_term = body.search_term.to_lowercase();
-	let mut users = services
-		.users
-		.stream()
-		.map(ToOwned::to_owned)
-		.broad_filter_map(async |user_id| {
-			let display_name = services.users.displayname(&user_id).await.ok();
+	let mut users = services.users.stream().broad_filter_map(async |user_id| {
+		let display_name = services.users.displayname(&user_id).await.ok();
 
-			let user_id_matches = user_id.as_str().to_lowercase().contains(&search_term);
+		let user_id_matches = user_id.as_str().to_lowercase().contains(&search_term);
 
-			let display_name_matches = display_name
-				.as_deref()
-				.map(str::to_lowercase)
-				.is_some_and(|display_name| display_name.contains(&search_term));
+		let display_name_matches = display_name
+			.as_deref()
+			.map(str::to_lowercase)
+			.is_some_and(|display_name| display_name.contains(&search_term));
 
-			if !user_id_matches && !display_name_matches {
-				return None;
-			}
+		if !user_id_matches && !display_name_matches {
+			return None;
+		}
 
-			let user_in_public_room = services
+		let user_in_public_room =
+			services
 				.rooms
 				.state_cache
 				.rooms_joined(&user_id)
-				.map(ToOwned::to_owned)
 				.broad_any(async |room_id| {
 					services
 						.rooms
@@ -63,24 +60,25 @@ pub(crate) async fn search_users_route(
 						.await
 				});
 
-			let user_sees_user = services
-				.rooms
-				.state_cache
-				.user_sees_user(sender_user, &user_id);
+		let user_sees_user = services
+			.rooms
+			.state_cache
+			.user_sees_user(sender_user, &user_id);
 
-			pin_mut!(user_in_public_room, user_sees_user);
-			user_in_public_room
-				.or(user_sees_user)
-				.await
-				.then_some(search_users::v3::User {
-					user_id: user_id.clone(),
-					display_name,
-					avatar_url: services.users.avatar_url(&user_id).await.ok(),
-				})
-		});
+		pin_mut!(user_in_public_room, user_sees_user);
+
+		if user_in_public_room.or(user_sees_user).await {
+			Some(assign!(search_users::v3::User::new(user_id.clone()), {
+				display_name,
+				avatar_url: services.users.avatar_url(&user_id).await.ok(),
+			}))
+		} else {
+			None
+		}
+	});
 
 	let results = users.by_ref().take(limit).collect().await;
 	let limited = users.next().await.is_some();
 
-	Ok(search_users::v3::Response { results, limited })
+	Ok(search_users::v3::Response::new(results, limited))
 }