diff --git a/progit/templates/issue.html b/progit/templates/issue.html
index a46b53c..76d2e69 100644
--- a/progit/templates/issue.html
+++ b/progit/templates/issue.html
@@ -40,7 +40,7 @@
     {% endautoescape %}
   </span>
   <p>
-      Opened by
+      Opened by {{ issue.user.user | avatar(16) | safe }}
       <a href="{{ url_for('view_user', username=issue.user.user)}}">
         {{ issue.user.user }}
       </a>
@@ -58,6 +58,7 @@
       {{ comment.comment | rst2html }}
     {% endautoescape %}
     <p>
+      {{ comment.user.user | avatar(16) | safe }}
       <a href="{{ url_for('view_user', username=comment.user.user)}}">
         {{ comment.user.user }}
       </a>