diff --git a/rhodecode/templates/changeset/changeset.mako b/rhodecode/templates/changeset/changeset.mako
--- a/rhodecode/templates/changeset/changeset.mako
+++ b/rhodecode/templates/changeset/changeset.mako
@@ -36,7 +36,12 @@
               rc_user = h.discover_user(c.commit.author_email)
           %>
           <div class="left-content-avatar">
-            ${base.gravatar(c.commit.author_email, 30, tooltip=(True if rc_user else False), user=rc_user)}
+            <%
+                email = h.email_or_none(c.commit.author)
+                rc_user = h.discover_user(c.commit.author)
+            %>
+            ${base.gravatar(email, 30, tooltip=(True if rc_user else False), user=rc_user)}
+
           </div>
 
           <div class="left-content-message">
@@ -45,6 +50,7 @@
           </div>
 
           <div class="fieldset collapsable-content" data-toggle="summary-details" style="display: none">
+
             <div class="commit">${h.urlify_commit_message(c.commit.message,c.repo_name)}</div>
           </div>