diff --git a/pagure/templates/_formhelper.html b/pagure/templates/_formhelper.html
index 93d49ff..5785bf7 100644
--- a/pagure/templates/_formhelper.html
+++ b/pagure/templates/_formhelper.html
@@ -101,7 +101,7 @@
 {% macro show_comment(comment, id, repo, username, issueid, form, repo_admin) %}
 <div class="card clearfix">
   <div id="comment-{{ id }}" class="card-header">
-        {{ comment.user.user | avatar(16) | safe }}
+        {{ comment.user.default_email | avatar(16) | safe }}
         <a href="{{ url_for('view_user', username=comment.user.user)}}">
           {{ comment.user.user }}
         </a> <a class="headerlink pull-xs-right" title="Permalink to this headline"
diff --git a/pagure/templates/_render_repo.html b/pagure/templates/_render_repo.html
index 78ee52f..07dcbe1 100644
--- a/pagure/templates/_render_repo.html
+++ b/pagure/templates/_render_repo.html
@@ -175,17 +175,25 @@
                 {% endif %}
 
                 {% if repo.avatar_email %}
-                  <img class="projecticon pull-xs-left" src="{{ repo.avatar_email | avatar_url }}" width=60 height=60 />
+                  <img class="projecticon pull-xs-left"
+                    src="{{ repo.avatar_email | avatar_url }}"
+                    width=60 height=60 />
                 {% else %}
-                    <div class="projecticon pull-xs-left"><span class="oi" data-glyph="document"></span></div>
+                    <div class="projecticon pull-xs-left">
+                      <span class="oi" data-glyph="document"></span>
+                    </div>
                 {% endif %}
                 <a class="project_link logo_link" href="{{ url }}">
                     <div class="repo_name">
                       <strong>{{ repo.name }}</strong>
                     </div>
                 </a>
-                <div class="repo_desc" title="{{ repo.description }}" data-toggle="tooltip">
-                  <small>{% if repo.description %}{{ repo.description }}{%else%}<span class="text-muted">no description<span>{% endif %}</small>
+                <div class="repo_desc" title="{{ repo.description }}"
+                    data-toggle="tooltip">
+                  <small>{% if
+                    repo.description %}{{ repo.description }}{%
+                    else %}<span class="text-muted">no description<span>{%
+                    endif %}</small>
                 </div>
               </div>
             {% endfor %}
diff --git a/pagure/templates/edit_file.html b/pagure/templates/edit_file.html
index ab39427..bd8458d 100644
--- a/pagure/templates/edit_file.html
+++ b/pagure/templates/edit_file.html
@@ -50,7 +50,7 @@
                 endif %}>{{ email.email }}</option>
             {% endfor %}
           </select>
-          {{ user.username | avatar(16) | safe }}
+          {{ user.default_email | avatar(16) | safe }}
           {{ user.fullname }}
         </div>
       </fieldset>
diff --git a/pagure/templates/group_info.html b/pagure/templates/group_info.html
index 3a8dec8..c1a69f4 100644
--- a/pagure/templates/group_info.html
+++ b/pagure/templates/group_info.html
@@ -71,7 +71,7 @@
             {% for user in group.users %}
             <div class="list-group-item">
               <a href="{{ url_for('view_user', username=user.user)}}" title="{{ user.fullname }}" data-toggle="tooltip">
-                {{ user.user | avatar(28) | safe }}
+                {{ user.default_email | avatar(28) | safe }}
                 {{ user.user }}
               </a>
               {% if authenticated and user != group.creator and member %}
diff --git a/pagure/templates/issues.html b/pagure/templates/issues.html
index 1f74745..e0d7a31 100644
--- a/pagure/templates/issues.html
+++ b/pagure/templates/issues.html
@@ -101,7 +101,7 @@
                     repo=repo.name, author=issue.user.user,
                     tags=tags, assignee=assignee, status=status) }}"
                     title="Filter issues by reporter">
-                    {{ issue.user.user | avatar(16) | safe }}
+                    {{ issue.user.default_email | avatar(16) | safe }}
                     {{ issue.user.user }}
                 </a>
             </td>
@@ -114,7 +114,7 @@
                 repo=repo.name, assignee=issue.assignee.username,
                 tags=tags, author=author, status=status) }}"
                 title="Filter issues by assignee">
-                {{ issue.assignee.user | avatar(16) | safe }}
+                {{ issue.assignee.default_email | avatar(16) | safe }}
                 {{ issue.assignee.user }}
               </a>
               {% else %}
diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index b57c7ca..de8a826 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -50,7 +50,7 @@
 
   <h5 class="text-muted">
     Proposed <a href="#" data-toggle="tooltip" title="{{ pull_request.date_created.strftime('%b %d %Y %H:%M:%S') }}">{{ pull_request.date_created |humanize }}</a>
-    by {{ pull_request.user.user | avatar(16) | safe }} {{ pull_request.user.user }}
+    by {{ pull_request.user.default_email | avatar(16) | safe }} {{ pull_request.user.user }}
   </h5>
 
   From
diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html
index 40d598b..092f348 100644
--- a/pagure/templates/repo_info.html
+++ b/pagure/templates/repo_info.html
@@ -184,14 +184,14 @@ git push -u origin master</pre>
             <div class="m-b-2">
               <div>
                 <a href="{{ url_for('view_user', username=repo.user.user)}}">
-                  {{ repo.user.user | avatar(20) | safe }}
+                  {{ repo.user.default_email | avatar(20) | safe }}
                   {{ repo.user.fullname }} ({{ repo.user.user }})  -  creator
                 </a>
               </div>
               {% for user in repo.users %}
                 <div>
                   <a href="{{ url_for('view_user', username=user.user)}}">
-                    {{ user.user | avatar(20) | safe }}
+                    {{ user.default_email | avatar(20) | safe }}
                     {{ user.fullname }} ({{ user.user }})
                   </a>
                 </div>
diff --git a/pagure/templates/requests.html b/pagure/templates/requests.html
index 956650d..45d0f1b 100644
--- a/pagure/templates/requests.html
+++ b/pagure/templates/requests.html
@@ -61,7 +61,7 @@
                   repo=repo.name, author=request.user.user,
                   assignee=assignee, status=status) }}"
                   title="Filter requests by reporter">
-                {{ request.user.user | avatar(16) | safe }}
+                {{ request.user.default_email | avatar(16) | safe }}
                 {{ request.user.user }}
               </a>
             </td>
@@ -71,7 +71,7 @@
                 repo=repo.name, assignee=request.assignee.username,
                 author=author, status=status) }}"
                 title="Filter issues by assignee">
-                {{ request.assignee.user | avatar(16) | safe }}
+                {{ request.assignee.default_email | avatar(16) | safe }}
                 {{ request.assignee.user }}
               </a>
               {% else %}
diff --git a/pagure/templates/user_info.html b/pagure/templates/user_info.html
index 6b49bf1..f812776 100644
--- a/pagure/templates/user_info.html
+++ b/pagure/templates/user_info.html
@@ -23,7 +23,7 @@
 <div class="p-t-2">
   <div class="container">
     <h2>
-        {{ username | avatar(36) | safe }} {{ username }}
+        {{ user.default_email | avatar(36) | safe }} {{ username }}
 
     </h2>
     <p title="{{ user.created.strftime('%Y-%m-%d') }}">
diff --git a/pagure/templates/user_requests.html b/pagure/templates/user_requests.html
index f65002d..997ae37 100644
--- a/pagure/templates/user_requests.html
+++ b/pagure/templates/user_requests.html
@@ -40,7 +40,7 @@
         </tfoot>
         <tbody>
         {% for request in requests %}
-            <tr class="pr-status pr-status-{{request.status|lower}}" 
+            <tr class="pr-status pr-status-{{request.status|lower}}"
               {%if request.status|lower != "open" %}style="display:none;"{% endif %}>
                 <td class="nowrap"><span class="label label-default">PR#{{ request.id }}</span></td>
                 <td><span class="label {%
@@ -69,7 +69,7 @@
                 </td>
                 <td class="nowrap">
                   {% if request.assignee %}
-                  {{ request.assignee.user | avatar(16) | safe }}
+                  {{ request.assignee.default_email | avatar(16) | safe }}
                   {{ request.assignee.user }}
                   {% else %}
                   <span class="text-muted">unassigned</span>