diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 2b9514bf3..d27824fa8 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -164,6 +164,12 @@ export default {
     },
 
     async sendMessage(message) {
+      //check for usersTag and change userid to username
+      message.usersTag.forEach(userTag =>{
+        let needle = `<usertag>${userTag.id}</usertag>`
+        let replacement = `<usertag>@${userTag.name.replaceAll(" ","-").toLowerCase()}</usertag>`
+        message.content = message.content.replaceAll(needle,replacement)
+      })
       try {
         await this.$apollo.mutate({
           mutation: createMessageMutation(),