diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
index 7b46ffb67..bb4c6fd16 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
@@ -34,8 +34,8 @@
                     <div class="wl-col title"><h3>{{ 'location'|trans }}</h3></div>
                     <div class="wl-col list">
                         <p class="wl-item">
-                            <span>{{ activity.location.locationType.title|localize_translatable_string }}</span>
                             {{ activity.location.name }}
+                            <span>({{ activity.location.locationType.title|localize_translatable_string }})</span>
                         </p>
                     </div>
                 </div>
@@ -57,7 +57,7 @@
                     <div class="wl-col title"><h3>{{ 'Referrer'|trans }}</h3></div>
                     <div class="wl-col list">
                         <p class="wl-item">
-                            {{ activity.user.usernameCanonical|chill_entity_render_string|capitalize }}
+                            {{ activity.user|chill_entity_render_string|capitalize }}
                         </p>
                     </div>
                 </div>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index 9faacd430..633493104 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -34,7 +34,7 @@
         <div class="item-row separator">
             <dl class="chill_view_data">
                 <dt class="inline">{{ 'Referrer'|trans|capitalize }}</dt>
-                <dd>{{ entity.user }}</dd>
+                <dd>{{ entity.user|chill_entity_render_box }}</dd>
 
                 {%- if entity.scope -%}
                     <dt class="inline">{{ 'Scope'|trans }}</dt>
@@ -103,8 +103,8 @@
                 <dd>
                     {% if entity.location is not null %}
                         <p>
-                            <span>{{ entity.location.locationType.title|localize_translatable_string }}</span>
                             {{ entity.location.name }}
+                            <span>({{ entity.location.locationType.title|localize_translatable_string }})</span>
                         </p>
                         <div class="ms-3">{{ entity.location.address|chill_entity_render_box }}</div>
                     {% else %}