diff --git a/web/src/lib/components/repo/issues/IssueCardContent.svelte b/web/src/lib/components/repo/issues/IssueCardContent.svelte
index dbecb588..d105793d 100644
--- a/web/src/lib/components/repo/issues/IssueCardContent.svelte
+++ b/web/src/lib/components/repo/issues/IssueCardContent.svelte
@@ -30,7 +30,7 @@
 	<IssueStatePill state={issue.state} />
 
 	<span class="ml-1 flex items-center gap-1">
-		<User handle={issue.authorHandle} did={issue.authorDid} />
+		<User handle={issue.authorHandle} did={issue.authorDid} link />
 	</span>
 
 	<Separator variant="dot" />
diff --git a/web/src/lib/components/repo/issues/IssueInfoBar.svelte b/web/src/lib/components/repo/issues/IssueInfoBar.svelte
index 49184160..7643f62a 100644
--- a/web/src/lib/components/repo/issues/IssueInfoBar.svelte
+++ b/web/src/lib/components/repo/issues/IssueInfoBar.svelte
@@ -22,7 +22,7 @@
 
 	<span class="ml-1 flex items-center gap-1">
 		opened by
-		<User size="small" handle={authorHandle} did={authorDid} />
+		<User size="small" handle={authorHandle} did={authorDid} link />
 	</span>
 
 	<span class="before:mr-1 before:content-['·']">
diff --git a/web/src/lib/components/timeline/TimelineFollowEvent.svelte b/web/src/lib/components/timeline/TimelineFollowEvent.svelte
index 54df1f63..e9f38a8b 100644
--- a/web/src/lib/components/timeline/TimelineFollowEvent.svelte
+++ b/web/src/lib/components/timeline/TimelineFollowEvent.svelte
@@ -11,9 +11,9 @@
 
 <TimelineCard>
 	{#snippet header()}
-		<User handle={event.actor.handle} did={event.actor.did} />
+		<User handle={event.actor.handle} did={event.actor.did} link />
 		<span>followed</span>
-		<User handle={event.subject.handle} did={event.subject.did} />
+		<User handle={event.subject.handle} did={event.subject.did} link />
 		<span class="text-foreground-subtle">{relativeTime(eventAt)}</span>
 	{/snippet}
 
diff --git a/web/src/lib/components/timeline/TimelineRepoEvent.svelte b/web/src/lib/components/timeline/TimelineRepoEvent.svelte
index fb35ab83..23687a1e 100644
--- a/web/src/lib/components/timeline/TimelineRepoEvent.svelte
+++ b/web/src/lib/components/timeline/TimelineRepoEvent.svelte
@@ -11,7 +11,7 @@
 
 <TimelineCard>
 	{#snippet header()}
-		<User handle={event.repo.owner.handle} did={event.repo.owner.did} />
+		<User handle={event.repo.owner.handle} did={event.repo.owner.did} link />
 		{#if event.source}
 			<span>forked</span>
 			<a href={repoHref(event.source)} class="text-foreground-default"
diff --git a/web/src/lib/components/timeline/TimelineStarEvent.svelte b/web/src/lib/components/timeline/TimelineStarEvent.svelte
index 66efda70..fff1bb43 100644
--- a/web/src/lib/components/timeline/TimelineStarEvent.svelte
+++ b/web/src/lib/components/timeline/TimelineStarEvent.svelte
@@ -11,7 +11,7 @@
 
 <TimelineCard>
 	{#snippet header()}
-		<User handle={event.actor.handle} did={event.actor.did} />
+		<User handle={event.actor.handle} did={event.actor.did} link />
 		<span>starred</span>
 		<a href={repoHref(event.repo)} class="text-foreground-default"
 			>{event.repo.owner.handle}/{event.repo.slug}</a
diff --git a/web/src/lib/components/ui/User.svelte b/web/src/lib/components/ui/User.svelte
index aff642f6..9a73015c 100644
--- a/web/src/lib/components/ui/User.svelte
+++ b/web/src/lib/components/ui/User.svelte
@@ -18,21 +18,27 @@
 					handle: "typography-paragraph-large"
 				},
 				regular: {
-					root: "gap-1",
+					root: "gap-1.5",
 					handle: "typography-paragraph-regular"
 				},
 				small: {
-					root: "gap-1",
+					root: "gap-1.5",
 					handle: "typography-paragraph-small"
 				},
 				mini: {
 					root: "gap-1",
 					handle: "typography-paragraph-mini"
 				}
+			},
+			link: {
+				true: {
+					root: "text-foreground-default hover:underline"
+				}
 			}
 		},
 		defaultVariants: {
-			size: "regular"
+			size: "regular",
+			link: false
 		}
 	});
 
@@ -51,6 +57,7 @@
 </script>
 
 <script lang="ts">
+	import { resolve } from "$app/paths";
 	import Avatar from "./Avatar.svelte";
 
 	interface Props {
@@ -62,6 +69,7 @@
 		class?: string;
 		avatarClass?: string;
 		handleClass?: string;
+		link?: boolean;
 	}
 
 	let {
@@ -72,17 +80,30 @@
 		showText = true,
 		class: className,
 		avatarClass,
-		handleClass
+		handleClass,
+		link = false
 	}: Props = $props();
 
-	const slots = $derived(user({ size }));
+	const actor = $derived(handle ?? did);
+	const linked = $derived(link && actor !== undefined);
+	const slots = $derived(user({ size, link: linked }));
 </script>
 
-<span class={slots.root({ class: className })}>
+{#snippet body()}
 	{#if showImage}
 		<Avatar {did} {handle} size={avatarSize[size]} class={avatarClass} />
 	{/if}
 	{#if showText && handle}
 		<span class={slots.handle({ class: handleClass })}>{handle}</span>
 	{/if}
-</span>
+{/snippet}
+
+{#if linked}
+	<a href={resolve(`/${actor}` as "/")} class={slots.root({ class: className })}>
+		{@render body()}
+	</a>
+{:else}
+	<span class={slots.root({ class: className })}>
+		{@render body()}
+	</span>
+{/if}