diff --git a/client/src/Board.js b/client/src/Board.js
index 614e732..e5a16c9 100755
--- a/client/src/Board.js
+++ b/client/src/Board.js
@@ -308,10 +308,15 @@ const Chat = ({ board, promoteGameState }) => {
   //const timeDelta = game.timestamp - Date.now();
   const messages = board.game.chat.map((item, index) => {
     /* If the date is in the future, set it to now */
+    const name = getPlayerName(board.game.sessions, item.from),
+      from = name ? `${name}, ` : '';
     return (
       <ListItem key={`msg-${item.date}`}>
         <PlayerColor color={item.from}/>
-        <ListItemText primary={item.message} secondary={(<Moment fromNow date={item.date > Date.now() ? Date.now() : item.date} interval={1000}/>)} />
+        <ListItemText primary={item.message}
+          secondary={(<>{from}
+            <Moment fromNow date={item.date > Date.now() ?
+              Date.now() : item.date} interval={1000}/></>)} />
       </ListItem>
     );
   });