--- a/sat_templates/templates/default/components/avatar.html	Wed Jan 08 14:31:46 2020 +0100
+++ b/sat_templates/templates/default/components/avatar.html	Sun Apr 19 22:48:57 2020 +0200
@@ -1,9 +1,9 @@
 {% macro avatar(jid, class) %}
     {%- if identities is defined -%}
         {%- if identities[jid].avatar_basename is defined %}
-            <img class="avatar {{class}}" src="{{cache_path}}{{identities[jid].avatar_basename}}">
+            <img class="avatar {{class}}" src="/cache/common/{{identities[jid].avatar_basename}}">
         {% else %}
-            <span class="avatar avatar--generated {{class}}"><span class="avatar__content">{{identities[jid].nick|first|upper}}</span></span>
+            <span class="avatar avatar--generated {{class}}"><span class="avatar__content">{{identities[jid].nicknames[0]|first|upper}}</span></span>
         {%- endif -%}
     {%- endif -%}
 {% endmacro %}