diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py
index f734e0a..ff716ed 100644
--- a/pagure/lib/__init__.py
+++ b/pagure/lib/__init__.py
@@ -244,7 +244,8 @@ def add_issue_comment(session, issue, comment, user, ticketfolder,
                 'issue_id': issue.id,
                 'comment_added': text2markdown(issue_comment.comment),
                 'comment_user': issue_comment.user.user,
-                'avatar_url': avatar_url(issue_comment.user.user, size=16),
+                'avatar_url': avatar_url_from_openid(
+                    issue_comment.user.default_email, size=16),
                 'comment_date': issue_comment.date_created.strftime(
                     '%Y-%m-%d %H:%M:%S'),
             }))
@@ -818,7 +819,8 @@ def add_pull_request_comment(session, request, commit, filename, row,
             'comment_added': text2markdown(pr_comment.comment),
             'comment_user': pr_comment.user.user,
             'comment_id': pr_comment.id,
-            'avatar_url': avatar_url(pr_comment.user.user, size=16),
+            'avatar_url': avatar_url_from_openid(
+                pr_comment.user.default_email, size=16),
             'comment_date': pr_comment.date_created.strftime('%Y-%m-%d %H:%M:%S'),
             'commit_id': commit,
             'filename': filename,
@@ -889,7 +891,8 @@ def edit_comment(session, parent, comment, user,
                 'comment_id': comment.id,
                 'parent_id': comment.parent.id,
                 'comment_editor': user_obj.user,
-                'avatar_url': avatar_url(comment.user.user, size=16),
+                'avatar_url': avatar_url_from_openid(
+                    comment.user.default_email, size=16),
                 'comment_date': comment.edited_on.strftime('%Y-%m-%d %H:%M:%S'),
             }))