diff --git a/src/Model/Chat/chatModel.ts b/src/Model/Chat/chatModel.ts
index b1c90d4a..b46635a5 100644
--- a/src/Model/Chat/chatModel.ts
+++ b/src/Model/Chat/chatModel.ts
@@ -181,8 +181,8 @@ export default class ChatModel {
     };
 
     readonly getSendingData = (): [string, string, string] => {
-        const senderName: string = this.settingsModel.username || "?";
         const id: string = this.settingsModel.userid;
+        const senderName: string = this.settingsModel.username || "?";
 
         const allChannels: string[] = [this.id];
         for (const secondaryChannel of this.info.secondaryChannels) {
@@ -395,8 +395,8 @@ export default class ChatModel {
 
     static createChatMessage = async (
         channel: string,
-        sender: string,
         senderId: string,
+        senderName: string,
         encryptionKey: string,
         body: string,
         inlineReplyId?: string,
@@ -408,7 +408,7 @@ export default class ChatModel {
             id: v4(),
 
             channel,
-            sender,
+            senderName,
             senderId,
             body,
             dateSent: createTimestamp(),
@@ -495,8 +495,8 @@ export interface ChatMessage extends ValidObject {
     readonly id: string;
 
     readonly channel: string;
-    readonly sender: string;
     readonly senderId: string;
+    readonly senderName: string;
     body: string;
     readonly dateSent: string;
     readonly inlineReplyId?: string;
@@ -539,7 +539,7 @@ export const ChatMessageReference: ChatMessage = {
     id: "",
 
     channel: "",
-    sender: "",
+    senderName: "",
     senderId: "",
     body: "",
     dateSent: "",
diff --git a/src/View/Components/chatMessage.tsx b/src/View/Components/chatMessage.tsx
index 9e0e60d4..760de170 100644
--- a/src/View/Components/chatMessage.tsx
+++ b/src/View/Components/chatMessage.tsx
@@ -38,7 +38,7 @@ export function ChatMessage(
             <div class="main tile">
                 <div class="text-container">
                     <span class="sender-name ellipsis">
-                        {chatMessageViewModel.sender}
+                        {chatMessageViewModel.senderName}
                     </span>
                     <span
                         class="body"
diff --git a/src/View/Components/inlineReply.tsx b/src/View/Components/inlineReply.tsx
index 9c632092..8863141f 100644
--- a/src/View/Components/inlineReply.tsx
+++ b/src/View/Components/inlineReply.tsx
@@ -12,7 +12,7 @@ export function InlineReply(chatMessageViewModel: ChatMessageViewModel) {
 
     return (
         <div class="inline-reply" on:click={scroll}>
-            <span>{reply.sender}</span>
+            <span>{reply.senderId}</span>
             <b class="ellipsis" subscribe:innerText={reply.body}></b>
         </div>
     );
diff --git a/src/View/Components/replyPreview.tsx b/src/View/Components/replyPreview.tsx
index b694a041..470365ea 100644
--- a/src/View/Components/replyPreview.tsx
+++ b/src/View/Components/replyPreview.tsx
@@ -9,7 +9,7 @@ export function ReplyPreview(
     return (
         <div class="reply-preview">
             <div class="surface blur">
-                <span class="secondary">{chatMessageViewModel.sender}</span>
+                <span class="secondary">{chatMessageViewModel.senderId}</span>
                 <b
                     class="ellipsis"
                     subscribe:innerText={chatMessageViewModel.body}
diff --git a/src/View/Components/replyViewHeader.tsx b/src/View/Components/replyViewHeader.tsx
index 00c540b2..6359e7c7 100644
--- a/src/View/Components/replyViewHeader.tsx
+++ b/src/View/Components/replyViewHeader.tsx
@@ -18,7 +18,7 @@ export function ReplyViewHeader(
                 ? ""
                 : coreViewModel.translations.chatPage.message.replyHeaderLabel(
                       messagePageViewModel.replyViewSelectedMessage.value
-                          .sender,
+                          .senderId,
                   ),
     );
     const message = React.createProxyState(
diff --git a/src/View/Modals/chatMessageInfoModal.tsx b/src/View/Modals/chatMessageInfoModal.tsx
index ee3cff93..462f4b31 100644
--- a/src/View/Modals/chatMessageInfoModal.tsx
+++ b/src/View/Modals/chatMessageInfoModal.tsx
@@ -27,7 +27,7 @@ export function ChatMessageInfoModal(
                         {InfoTile(
                             "account_circle",
                             coreViewModel.translations.chatPage.message.sentBy,
-                            chatMessageViewModel.sender,
+                            chatMessageViewModel.senderId,
                         )}
                         {InfoTile(
                             "schedule",
diff --git a/src/ViewModel/Chat/chatMessageViewModel.ts b/src/ViewModel/Chat/chatMessageViewModel.ts
index 5871d4a4..af80efcb 100644
--- a/src/ViewModel/Chat/chatMessageViewModel.ts
+++ b/src/ViewModel/Chat/chatMessageViewModel.ts
@@ -12,7 +12,8 @@ export default class ChatMessageViewModel {
     // data
     chatMessage: ChatMessage;
     channel: string = "";
-    sender: string = "";
+    senderId: string = "";
+    senderName: string = "";
     dateSent: string = "";
     body: React.State<string> = new React.State("");
     inlineReply: ChatMessageViewModel | undefined = undefined;
@@ -165,7 +166,7 @@ export default class ChatMessageViewModel {
             this.allReactions.set(reaction.senderId, reaction);
         }
 
-        if (reaction.senderId != this.coreViewModel.settingsModel.username)
+        if (reaction.senderId != this.coreViewModel.settingsModel.userid)
             return;
         this.userReaction.value = reaction.isDeleting
             ? undefined
@@ -183,7 +184,8 @@ export default class ChatMessageViewModel {
     // load
     loadData = (): void => {
         this.channel = this.chatMessage.channel;
-        this.sender = this.chatMessage.sender;
+        this.senderId = this.chatMessage.senderId;
+        this.senderName = this.chatMessage.senderName;
         this.dateSent = new Date(this.chatMessage.dateSent).toLocaleString();
         this.body.value = this.chatMessage.body;
         this.status.value = this.chatMessage.status;
diff --git a/src/ViewModel/Global/notificationViewModel.ts b/src/ViewModel/Global/notificationViewModel.ts
index 6adec03e..f88dfba9 100644
--- a/src/ViewModel/Global/notificationViewModel.ts
+++ b/src/ViewModel/Global/notificationViewModel.ts
@@ -87,7 +87,7 @@ export default class NotificationViewModel {
             messageId: message.id,
             chat,
             fullChannel,
-            sender: message.sender,
+            sender: message.senderName,
             body: message.body,
         };
     }
diff --git a/src/ViewModel/Pages/messagePageViewModel.ts b/src/ViewModel/Pages/messagePageViewModel.ts
index 29eb2913..7ba72193 100644
--- a/src/ViewModel/Pages/messagePageViewModel.ts
+++ b/src/ViewModel/Pages/messagePageViewModel.ts
@@ -110,7 +110,7 @@ export default class MessagePageViewModel extends Context {
             this.coreViewModel,
             this,
             chatMessage,
-            chatMessage.sender ==
+            chatMessage.senderName ==
                 this.chatViewModel.settingsViewModel.username.value,
         );