diff --git a/website/client/components/hall/heroes.vue b/website/client/components/hall/heroes.vue
index f0847cb93f..fe13b65723 100644
--- a/website/client/components/hall/heroes.vue
+++ b/website/client/components/hall/heroes.vue
@@ -90,12 +90,8 @@
         tbody
           tr(v-for='(hero, index) in heroes')
             td
-              span(v-if='hero.contributor && hero.contributor.admin', :popover="$t('gamemaster')", popover-trigger='mouseenter', popover-placement='right')
-                .label.label-default(:class='userLevelStyle(hero)')
-                  | {{hero.profile.name}} 
-                  //- span(v-class='userAdminGlyphiconStyle(hero)')
-              span(v-if='!hero.contributor || !hero.contributor.admin')
-                .label.label-default(v-if='hero.profile', v-class='userLevelStyle(hero)') {{hero.profile.name}}
+              user-link(v-if='hero.contributor && hero.contributor.admin', :user='hero', :popover="$t('gamemaster')", popover-trigger='mouseenter', popover-placement='right')
+              user-link(v-if='!hero.contributor || !hero.contributor.admin', :user='hero')
             td(v-if='user.contributor.admin', @click='populateContributorInput(hero._id, index)').btn-link {{hero._id}}
             td {{hero.contributor.level}}
             td {{hero.contributor.text}}
@@ -120,9 +116,13 @@ import { mountInfo, petInfo } from 'common/script/content/stable';
 import { food, hatchingPotions, special } from 'common/script/content';
 import gear from 'common/script/content/gear';
 import notifications from 'client/mixins/notifications';
+import userLink from '../userLink';
 
 export default {
   mixins: [notifications, styleHelper],
+  components: {
+    userLink,
+  },
   data () {
     return {
       heroes: [],