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