diff --git a/src/chat-api/Bitwise.ts b/src/chat-api/Bitwise.ts
index 09e1c292..ce1d4e64 100644
--- a/src/chat-api/Bitwise.ts
+++ b/src/chat-api/Bitwise.ts
@@ -392,6 +392,12 @@ export const ROLE_PERMISSIONS = {
     bit: 256,
     description: () => "Allow users to mention roles",
     icon: "alternate_email"
+  },
+  MASQUERADE: {
+    name: () => "Masquerade",
+    bit: 512,
+    description: () => "Allow members to change name and avatar per-message",
+    //icon: "alternate_email" // We dont need curently a icon for that because a "normal" user cant use it
   }
 };
 
diff --git a/src/chat-api/RawData.ts b/src/chat-api/RawData.ts
index fbaa04ca..b0872f11 100644
--- a/src/chat-api/RawData.ts
+++ b/src/chat-api/RawData.ts
@@ -101,6 +101,7 @@ export interface RawMessage {
 
   buttons: RawMessageButton[];
   roleMentions: RawServerRole[];
+  creatorOverrideId?: string | null;
   webhookId?: string;
 }
 
diff --git a/src/components/message-pane/message-item/MessageItem.tsx b/src/components/message-pane/message-item/MessageItem.tsx
index 45604f1e..f06c1647 100644
--- a/src/components/message-pane/message-item/MessageItem.tsx
+++ b/src/components/message-pane/message-item/MessageItem.tsx
@@ -336,6 +336,9 @@ const Details = (props: DetailsProps) => {
             : t("message.badge.bot")}
         </div>
       </Show>
+      <Show when={!props.message.webhookId && props.message.creatorOverrideId}>
+        <div class={styles.ownerBadge}>masq</div>
+      </Show>
       <div class={styles.date}>{formatTimestamp(props.message.createdAt)}</div>
       <Show when={props.message.silent}>
         <Tooltip tooltip="Silent" anchor="left">