diff --git a/app/views/static/about.html.haml b/app/views/static/about.html.haml
index 6b6acee1..46c284e9 100644
--- a/app/views/static/about.html.haml
+++ b/app/views/static/about.html.haml
@@ -51,35 +51,6 @@
             - User.where(contributor: true).each do |sup|
               %a{href: show_user_profile_path(sup.screen_name), title: sup.screen_name, data: { toggle: :tooltip, placement: :top }}
                 %img.img-rounded.answerbox--img-small{src: sup.profile_picture.url(:medium)}
-  .panel.panel-default
-    .panel-body
-      .row
-        .col-md-4
-          %h3= t 'views.about.team.title'
-          = t('views.about.team.desc', app_title: APP_CONFIG['site_name'])
-          %br/
-          - APP_CONFIG['admins'].each do |adm|
-            .media
-              .pull-left
-                %a{href: show_user_profile_path(adm['screen_name'])}
-                  %img.img-rounded.answerbox--img{src: User.find_by_screen_name(adm['screen_name']).profile_picture.url(:medium)}
-              .media-body
-                %h4.entry-text.entry-about= adm['about_text']
-                %h6.entry-subtext= adm['subtext']
-        .col-md-4
-          %h3= t 'views.about.moderators.title'
-          %p= t('views.about.moderators.desc', app_title: APP_CONFIG['site_name'])
-          %ul.about--moderator
-            - User.where(moderator: true).each do |mod|
-              %a{href: show_user_profile_path(mod.screen_name), title: mod.screen_name, data: { toggle: :tooltip, placement: :top }}
-                %img.img-rounded.answerbox--img{src: mod.profile_picture.url(:medium)}
-        .col-md-4
-          %h3= t 'views.about.funding.title'
-          %p= t('views.about.funding.desc', app_title: APP_CONFIG['site_name'])
-          %ul.about--moderator
-            - User.where(supporter: true).each do |sup|
-              %a{href: show_user_profile_path(sup.screen_name), title: sup.screen_name, data: { toggle: :tooltip, placement: :top }}
-                %img.img-rounded.answerbox--img{src: sup.profile_picture.url(:medium)}
   .panel.panel-default
     .panel-body
       .row
diff --git a/app/views/user/_profile_info.html.haml b/app/views/user/_profile_info.html.haml
index 14f37e10..57404894 100644
--- a/app/views/user/_profile_info.html.haml
+++ b/app/views/user/_profile_info.html.haml
@@ -1,29 +1,14 @@
 .panel.panel-default#profile
   %img.profile--avatar{src: @user.profile_picture.url(:large)}
-  - if @user.admin?
-    .profile--panel-badge.panel-badge-danger
-      %i.fa.fa-flask
-      = t 'views.user.title.admin'
-  - if @user.moderator?
-    .profile--panel-badge.panel-badge-success
-      %i.fa.fa-users
-      = t 'views.user.title.moderator'
-  - if @user.supporter?
-    .profile--panel-badge.panel-badge-warning
-      %i.fa.fa-star
-      = t 'views.user.title.supporter'
-  - if @user.contributor?
-    .profile--panel-badge.panel-badge-primary
-      %i.fa.fa-github
-      = t 'views.user.title.contributor'
-  - if @user.blogger?
-    .profile--panel-badge.panel-badge-info
-      %i.fa.fa-pencil
-      = t 'views.user.title.blogger'
-  - if @user.translator?
-    .profile--panel-badge.panel-badge-info
-      %i.fa.fa-globe
-      = t 'views.user.title.translator'
+  - if user_signed_in? && current_user.admin?
+    - if @user.admin?
+      .profile--panel-badge.panel-badge-danger
+        %i.fa.fa-flask
+        = t 'views.user.title.admin'
+    - if @user.moderator?
+      .profile--panel-badge.panel-badge-success
+        %i.fa.fa-users
+        = t 'views.user.title.moderator'
   - if @user.banned?
     .profile--panel-badge.panel-badge-default
       %i.fa.fa-ban