diff --git a/web/pgadmin/browser/__init__.py b/web/pgadmin/browser/__init__.py
index c6dfc86732b..e4b6e44e537 100644
--- a/web/pgadmin/browser/__init__.py
+++ b/web/pgadmin/browser/__init__.py
@@ -383,13 +383,13 @@ def _get_supported_browser():
 
 
 @blueprint.add_app_template_filter
-def gravatar(username):
+def gravatar(identifier):
     """
     This function adds a template filter which
     returns gravatar image for user.
     :return: gravatar image
     """
-    g = Gravatar(username)
+    g = Gravatar(identifier)
     return g.get_image(
         size=100,
         rating='g',
@@ -555,6 +555,7 @@ def utils():
             is_admin=current_user.has_role("Administrator"),
             login_url=login_url,
             username=current_user.username.replace("'","\\'"),
+            gravatar_identifier=current_user.email or current_user.username,
             auth_source=auth_source,
             heartbeat_timeout=config.SERVER_HEARTBEAT_TIMEOUT,
             password_length_min=config.PASSWORD_LENGTH_MIN,
diff --git a/web/pgadmin/browser/templates/browser/js/utils.js b/web/pgadmin/browser/templates/browser/js/utils.js
index d8996f0dafa..e88fcff4997 100644
--- a/web/pgadmin/browser/templates/browser/js/utils.js
+++ b/web/pgadmin/browser/templates/browser/js/utils.js
@@ -117,7 +117,7 @@ define('pgadmin.browser.utils',
     userMenuInfo: {
       username: '{{username}}',
       auth_source: '{{auth_source}}',
-      gravatar: {% if config.SHOW_GRAVATAR_IMAGE %}'{{ username | gravatar }}'{% else %}''{% endif %},
+      gravatar: {% if config.SHOW_GRAVATAR_IMAGE %}'{{ gravatar_identifier | gravatar }}'{% else %}''{% endif %},
       menus: [
         {% if auth_only_internal %}
         {