diff --git a/src/backend/database/user.rs b/src/backend/database/user.rs
index 3f43e69..81bd795 100644
--- a/src/backend/database/user.rs
+++ b/src/backend/database/user.rs
@@ -129,7 +129,7 @@ impl DbPerson {
             .select(person::all_columns)
             .into_boxed();
         query = if let Some(domain) = domain {
-            let domain_pattern = format!("{}://{domain}/%", http_protocol_str());
+            let domain_pattern = format!("%://{domain}/%");
             query
                 .filter(person::ap_id.ilike(domain_pattern))
                 .filter(person::local.eq(false))
diff --git a/src/frontend/mod.rs b/src/frontend/mod.rs
index 8112d62..f85c740 100644
--- a/src/frontend/mod.rs
+++ b/src/frontend/mod.rs
@@ -43,7 +43,15 @@ fn user_title(person: &DbPerson) -> String {
 }
 
 fn user_link(person: &DbPerson) -> impl IntoView {
-    let creator_path = format!("/user/{}", person.username);
+    let creator_path = if person.local {
+        format!("/user/{}", person.username)
+    } else {
+        format!(
+            "/user/{}@{}",
+            person.username,
+            extract_domain(&person.ap_id)
+        )
+    };
     view! { <a href=creator_path>{user_title(person)}</a> }
 }