diff --git a/internal/webserver/tpl/includes/author_info.tpl b/internal/webserver/tpl/includes/author_info.tpl
index 1c794e7..3470c9d 100644
--- a/internal/webserver/tpl/includes/author_info.tpl
+++ b/internal/webserver/tpl/includes/author_info.tpl
@@ -1,16 +1,36 @@
 {{define "author-info"}}
-<div class="author-info" hx-boost="true">
-  {{template "circle-profile-img" .}}
-  <span class="author-info__name-and-handle">
-    <div class="author-info__display-name row">
-      {{.DisplayName}}
-      {{if .IsPrivate}}
-        <div class="circle-outline">
-          <img class="svg-icon" src="/static/icons/lock.svg" width="24" height="24">
-        </div>
-      {{end}}
-    </div>
-    <div class="author-info__handle">@{{.Handle}}</div>
-  </span>
-</div>
+  <div class="author-info" hx-boost="true">
+    {{template "circle-profile-img" .}}
+    <span class="author-info__name-and-handle">
+      <div class="author-info__display-name row">
+        {{.DisplayName}}
+        {{if .IsPrivate}}
+          <div class="circle-outline">
+            <img class="svg-icon" src="/static/icons/lock.svg" width="24" height="24">
+          </div>
+        {{end}}
+      </div>
+      <div class="author-info__handle">@{{.Handle}}</div>
+    </span>
+  </div>
+{{end}}
+
+{{/*
+  For User Feed header-- the profile image is no longer a link, but should pop up in the image carousel on click
+*/}}
+{{define "author-info-no-link"}}
+  <div class="author-info" hx-boost="true">
+    {{template "circle-profile-img-no-link" .}}
+    <span class="author-info__name-and-handle">
+      <div class="author-info__display-name row">
+        {{.DisplayName}}
+        {{if .IsPrivate}}
+          <div class="circle-outline">
+            <img class="svg-icon" src="/static/icons/lock.svg" width="24" height="24">
+          </div>
+        {{end}}
+      </div>
+      <div class="author-info__handle">@{{.Handle}}</div>
+    </span>
+  </div>
 {{end}}
diff --git a/internal/webserver/tpl/includes/circle_profile_img.tpl b/internal/webserver/tpl/includes/circle_profile_img.tpl
index 5becc6d..c5ed832 100644
--- a/internal/webserver/tpl/includes/circle_profile_img.tpl
+++ b/internal/webserver/tpl/includes/circle_profile_img.tpl
@@ -11,7 +11,6 @@
   </a>
 {{end}}
 
-<!-- TODO: How to use this in a User Feed without a ton of prop-drilling? -->
 {{define "circle-profile-img-no-link"}}
   <a class="profile-image"
   	hx-trigger="click consume"
diff --git a/internal/webserver/tpl/includes/user_header.tpl b/internal/webserver/tpl/includes/user_header.tpl
index aa9b1ac..67c2a6d 100644
--- a/internal/webserver/tpl/includes/user_header.tpl
+++ b/internal/webserver/tpl/includes/user_header.tpl
@@ -12,7 +12,7 @@
 
     <div class="user-header__info-container">
       <div class="row">
-        {{template "author-info" .}}
+        {{template "author-info-no-link" .}}
         {{template "following-button" .}}
       </div>
       <div class="user-header__bio">