diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py
index 080a658..f734e0a 100644
--- a/pagure/lib/__init__.py
+++ b/pagure/lib/__init__.py
@@ -1989,17 +1989,6 @@ def update_user_ssh(session, user, ssh_key, keydir):
     session.flush()
 
 
-def avatar_url(username, size=64, default='retro'):
-    ''' Return the URL to be used for the avatar. '''
-    openid = "http://%s.id.fedoraproject.org/" % username
-    try:
-        return avatar_url_from_openid(openid, size, default)
-    except Exception as err:
-        pagure.LOG.debug('openid %s', openid)
-        pagure.LOG.debug(err)
-        return ''
-
-
 def avatar_url_from_openid(openid, size=64, default='retro', dns=False):
     """
     Our own implementation since fas doesn't support this nicely yet.
diff --git a/pagure/ui/filters.py b/pagure/ui/filters.py
index 1e25782..5cfb746 100644
--- a/pagure/ui/filters.py
+++ b/pagure/ui/filters.py
@@ -237,8 +237,13 @@ def avatar(packager, size=64, default="retro"):
     """ Template filter sorting the given branches, Fedora first then EPEL,
     then whatever is left.
     """
+    if not '@' in packager:
+        user = pagure.lib.search_user(SESSION, username=packager)
+        if user:
+            packager = user.default_email
+
     output = '<img class="avatar circle" src="%s"/>' % (
-        pagure.lib.avatar_url(packager, size, default)
+        avatar_url(packager, size)
     )
 
     return output
@@ -374,6 +379,7 @@ def int_to_rgb(percent):
         pass
     return output
 
+
 @APP.template_filter('return_md5')
 def return_md5(text):
     """ Template filter to return an MD5 for a string