diff --git a/fedireads/templates/snippets/username.html b/fedireads/templates/snippets/username.html
index 16505c86a..ea4381e57 100644
--- a/fedireads/templates/snippets/username.html
+++ b/fedireads/templates/snippets/username.html
@@ -1,2 +1,2 @@
 {% load fr_display %}
-<a href="/user/{{ user | username }}" class="user">{% if user.name %}{{ user.name }}{% else %}{{ user | username }}{% endif %}</a>
+<a href="/user/{{ user | username }}" class="user">{% if user.name %}{{ user.name }}{% else %}{{ user | username }}{% endif %}</a> {% if show_full and user.name or user.localname %} ({{ user.username }}){% endif %}
diff --git a/fedireads/templates/user.html b/fedireads/templates/user.html
index 0e5ba6a4a..8feb12abc 100644
--- a/fedireads/templates/user.html
+++ b/fedireads/templates/user.html
@@ -24,10 +24,8 @@
         <h2>Followers</h2>
         {% for follower in user.followers.all %}
         <div>
-            <a href="{{ follower.actor }}">{{ follower.username }}</a>
-            {% if not request.user in follower.followers.all and request.user != follower %}
+            {% include 'snippets/username.html' with user=follower show_full=True  %}
             {% include 'snippets/follow_button.html' with user=follower %}
-            {% endif %}
         </div>
         {% endfor %}
     </div>
@@ -36,10 +34,8 @@
         <h2>Following</h2>
         {% for following in user.following.all %}
         <div>
-            <a href="{{ following.actor }}">{{ following.username }}</a>
-            {% if not request.user in following.followers.all and request.user != following %}
+            {% include 'snippets/username.html' with user=following show_full=True  %}
             {% include 'snippets/follow_button.html' with user=following %}
-            {% endif %}
         </div>
         {% endfor %}
     </div>