--- a/Allura/allura/templates/jinja_master/lib.html
+++ b/Allura/allura/templates/jinja_master/lib.html
@@ -20,6 +20,12 @@
   {% else %}
     <b data-icon="{{g.icons['user'].char}}" class="ico emboss {{g.icons['user'].css}}{% if size %} x{{size}}{% endif %}{% if className %} {{className}}{% endif %}"></b>
   {% endif %}
+{%- endmacro %}
+
+{% macro gravatar_or_name(user, size, className) -%}
+  {% if user.icon_url() %}
+	gravatar(user, size, className)
+  {% else %}<span>{{ h.really_unicode(user.display_name) }}</span>{% endif %}
 {%- endmacro %}
 
 {% macro email_gravatar(email, title=None, size=None) -%}