diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
index a9a8d72c..cecdddf6 100644
--- a/bookwyrm/templates/snippets/status/status_header.html
+++ b/bookwyrm/templates/snippets/status/status_header.html
@@ -1,7 +1,9 @@
 {% load bookwyrm_tags %}
 {% load i18n %}
+<a href="{{ status.user.local_path }}">
 {% include 'snippets/avatar.html' with user=status.user ariaHide="true" %}
 {% include 'snippets/username.html' with user=status.user %}
+</a>
 
 {% if status.status_type == 'GeneratedNote' %}
     {{ status.content | safe }}
diff --git a/bookwyrm/templates/user/user_layout.html b/bookwyrm/templates/user/user_layout.html
index d7629160..75dc61dc 100644
--- a/bookwyrm/templates/user/user_layout.html
+++ b/bookwyrm/templates/user/user_layout.html
@@ -56,7 +56,7 @@
             <a href="{{ url }}">{% trans "Reading Goal" %}</a>
         </li>
         {% endif %}
-        {% if is_self or user.lists.exists %}
+        {% if is_self or user.list_set.exists %}
         {% url 'user-lists' user|username as url %}
         <li{% if url in request.path %} class="is-active"{% endif %}>
             <a href="{{ url }}">{% trans "Lists" %}</a>