diff --git a/rhodecode/templates/admin/notifications/notifications_data.html b/rhodecode/templates/admin/notifications/notifications_data.html
--- a/rhodecode/templates/admin/notifications/notifications_data.html
+++ b/rhodecode/templates/admin/notifications/notifications_data.html
@@ -10,7 +10,7 @@ unread = lambda n:{False:'unread'}.get(n
   <div id="notification_${notification.notification.notification_id}" class="container ${unread(notification.read)}">
     <div class="notification-header">
       <div class="gravatar">
-          <img alt="gravatar" src="${h.gravatar_url(h.email(notification.notification.created_by_user.email),24)}"/>
+          <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(notification.notification.created_by_user.email),24)}"/>
       </div>
       <div class="desc ${unread(notification.read)}">
       <a href="${url('notification', notification_id=notification.notification.notification_id)}">${notification.notification.description}</a>
diff --git a/rhodecode/templates/admin/notifications/show_notification.html b/rhodecode/templates/admin/notifications/show_notification.html
--- a/rhodecode/templates/admin/notifications/show_notification.html
+++ b/rhodecode/templates/admin/notifications/show_notification.html
@@ -30,7 +30,7 @@
       <div id="notification_${c.notification.notification_id}">
         <div class="notification-header">
           <div class="gravatar">
-              <img alt="gravatar" src="${h.gravatar_url(h.email(c.notification.created_by_user.email),24)}"/>
+              <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(c.notification.created_by_user.email),24)}"/>
           </div>
           <div class="desc">
               ${c.notification.description}
diff --git a/rhodecode/templates/changelog/changelog.html b/rhodecode/templates/changelog/changelog.html
--- a/rhodecode/templates/changelog/changelog.html
+++ b/rhodecode/templates/changelog/changelog.html
@@ -59,7 +59,7 @@ ${_('%s Changelog') % c.repo_name} - ${c
 							</div>
 							<div class="author">
 								<div class="gravatar">
-									<img alt="gravatar" src="${h.gravatar_url(h.email(cs.author),16)}"/>
+									<img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),16)}"/>
 								</div>
 								<div title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</div>
 							</div>
diff --git a/rhodecode/templates/changeset/changeset_range.html b/rhodecode/templates/changeset/changeset_range.html
--- a/rhodecode/templates/changeset/changeset_range.html
+++ b/rhodecode/templates/changeset/changeset_range.html
@@ -37,7 +37,7 @@
 			<table class="compare_view_commits noborder">
             %for cnt,cs in enumerate(c.cs_ranges):
                 <tr>
-                <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email(cs.author),14)}"/></div></td>
+                <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}"/></div></td>
                 <td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</td>
                 <td><div class="author">${h.person(cs.author)}</div></td>
                 <td><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
@@ -71,7 +71,7 @@
           <h3 style="padding-top:8px;">
           <a class="tooltip" title="${h.tooltip(cs.message)}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">${'r%s:%s' % (cs.revision,h.short_id(cs.raw_id))}</a>
            <div class="gravatar">
-               <img alt="gravatar" src="${h.gravatar_url(h.email(cs.author),20)}"/>
+               <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),20)}"/>
            </div>
            </h3>
           ${diff_block.diff_block(c.changes[cs.raw_id])}
diff --git a/rhodecode/templates/compare/compare_cs.html b/rhodecode/templates/compare/compare_cs.html
--- a/rhodecode/templates/compare/compare_cs.html
+++ b/rhodecode/templates/compare/compare_cs.html
@@ -6,7 +6,7 @@
   %else:
     %for cnt, cs in enumerate(c.cs_ranges):
         <tr>
-        <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email(cs.author),14)}"/></div></td>
+        <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}"/></div></td>
         <td>
           %if cs.raw_id in c.statuses:
             <div title="${c.statuses[cs.raw_id][1]}" class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[cs.raw_id][0])}" /></div>
diff --git a/rhodecode/templates/files/files_source.html b/rhodecode/templates/files/files_source.html
--- a/rhodecode/templates/files/files_source.html
+++ b/rhodecode/templates/files/files_source.html
@@ -48,7 +48,7 @@
         </div>
         <div class="author">
             <div class="gravatar">
-                <img alt="gravatar" src="${h.gravatar_url(h.email(c.file.changeset.author),16)}"/>
+                <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(c.file.changeset.author),16)}"/>
             </div>
             <div title="${c.file.changeset.author}" class="user">${h.person(c.file.changeset.author)}</div>
         </div>
diff --git a/rhodecode/templates/search/search_commit.html b/rhodecode/templates/search/search_commit.html
--- a/rhodecode/templates/search/search_commit.html
+++ b/rhodecode/templates/search/search_commit.html
@@ -12,7 +12,7 @@
             <div class="left">
                 <div class="author">
                     <div class="gravatar">
-                        <img alt="gravatar" src="${h.gravatar_url(h.email(sr['author']),20)}"/>
+                        <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(sr['author']),20)}"/>
                     </div>
                     <span>${h.person(sr['author'])}</span><br/>
                     <span><a href="mailto:${h.email_or_none(sr['author'])}">${h.email_or_none(sr['author'])}</a></span><br/>