diff --git a/rhodecode/public/css/forms.less b/rhodecode/public/css/forms.less
--- a/rhodecode/public/css/forms.less
+++ b/rhodecode/public/css/forms.less
@@ -354,7 +354,7 @@ form.rcform {
 
 .badged-field {
     .user-badge {
-        line-height: 25px;
+        line-height: 18px;
         padding: .4em;
         border-radius: @border-radius;
         border-top: 1px solid @grey4;
diff --git a/rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako b/rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako
--- a/rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako
+++ b/rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako
@@ -39,7 +39,7 @@
                     <div class="input">
                         <div class="badge-input-container">
                             <div class="user-badge">
-                                ${base.gravatar_with_user(c.repo_group.user.email, show_disabled=not c.repo_group.user.active)}
+                                ${base.gravatar(c.repo_group.user.email, user=c.repo_group.user,  tooltip=True)}
                             </div>
                             <div class="badge-input-wrap">
                                 ${c.form['repo_group_owner'].render(css_class='medium', oid='repo_group_owner')|n}
diff --git a/rhodecode/templates/admin/repos/repo_edit_settings.mako b/rhodecode/templates/admin/repos/repo_edit_settings.mako
--- a/rhodecode/templates/admin/repos/repo_edit_settings.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_settings.mako
@@ -154,7 +154,7 @@
                 <div class="input">
                     <div class="badge-input-container">
                         <div class="user-badge">
-                            ${base.gravatar_with_user(c.rhodecode_db_repo.user.email or c.rhodecode_db_repo.user.username, show_disabled=not c.rhodecode_db_repo.user.active)}
+                            ${base.gravatar(c.rhodecode_db_repo.user.email or c.rhodecode_db_repo.user.username, user=c.rhodecode_db_repo.user,  tooltip=True)}
                         </div>
                         <div class="badge-input-wrap">
                             ${c.form['repo_owner'].render(css_class='medium', oid='repo_owner')|n}
diff --git a/rhodecode/templates/admin/user_groups/user_group_edit_settings.mako b/rhodecode/templates/admin/user_groups/user_group_edit_settings.mako
--- a/rhodecode/templates/admin/user_groups/user_group_edit_settings.mako
+++ b/rhodecode/templates/admin/user_groups/user_group_edit_settings.mako
@@ -30,7 +30,7 @@
                         <div class="input">
                             <div class="badge-input-container">
                                 <div class="user-badge">
-                                    ${base.gravatar_with_user(c.user_group.user.email, show_disabled=not c.user_group.user.active)}
+                                    ${base.gravatar(c.user_group.user.email, user=c.user_group.user,  tooltip=True)}
                                 </div>
                                 <div class="badge-input-wrap">
                                     ${h.text('user', class_="medium", autocomplete="off")}