diff --git a/public/css/game-pane.styl b/public/css/game-pane.styl
index ccd0bae89d..d5c927e2ac 100644
--- a/public/css/game-pane.styl
+++ b/public/css/game-pane.styl
@@ -57,6 +57,11 @@
     label
         margin-right:5px
     
+    .float-label
+      float:left
+      position:absolute
+      top:17px;
+    
     .hidden-label
       visibility:hidden
       
diff --git a/views/options/social/chat-message.jade b/views/options/social/chat-message.jade
index 71aad7b3a5..3d8fe37494 100644
--- a/views/options/social/chat-message.jade
+++ b/views/options/social/chat-message.jade
@@ -1,9 +1,9 @@
 li.chat-message(ng-repeat='message in group.chat', ng-class=':: {highlight: isUserMentioned(user,message) || message.uuid=="system", "own-message": user._id == message.uuid}')
   .scrollable-message
-    a.label.label-default.chat-message(ng-if=':: message.user', ng-class='userLevelStyleFromLevel(message.contributor.level, message.backer.npc, style)', ng-click='clickMember(message.uuid, true)')
-      span(tooltip='{{::contribText(message.contributor, message.backer)}}') {{::message.user}} 
-      span(ng-class='userAdminGlyphiconStyleFromLevel(message.contributor.level)')
-    |  
+    span(ng-if='::message.uuid!="system"')
+      a.label.label-default.chat-message.hidden-label
+        span {{::message.user}}
+      |  
     markdown(ng-model='::message.text')
     | -
     span.muted.time(from-now='::message.timestamp')
@@ -13,3 +13,6 @@ li.chat-message(ng-repeat='message in group.chat', ng-class=':: {highlight: isUs
     |  
     a(ng-if=':: user.contributor.admin || message.uuid == user.id', ng-click='deleteChatMessage(group, message)')
       span.glyphicon.glyphicon-trash(tooltip=env.t('delete'))
+  a.label.label-default.chat-message(ng-if=':: message.user', class='float-label', ng-class='userLevelStyleFromLevel(message.contributor.level, message.backer.npc, style)', ng-click='clickMember(message.uuid, true)')
+      span(tooltip='{{::contribText(message.contributor, message.backer)}}') {{::message.user}} 
+      span(ng-class='userAdminGlyphiconStyleFromLevel(message.contributor.level)')