diff --git a/src/components/common/messaging/PinMessageBox.tsx b/src/components/common/messaging/PinMessageBox.tsx
index 4fa9ba28..e6e91096 100644
--- a/src/components/common/messaging/PinMessageBox.tsx
+++ b/src/components/common/messaging/PinMessageBox.tsx
@@ -93,7 +93,7 @@ export const PinMessageBox = observer(
 
 
         let children = null;
-        let userName = message.client ? message.client.user?.username : ""
+        let userName = message.client ? message.system.by_username : ""
 
 
         if (data.type as string == "message_pinned") {
diff --git a/src/lib/ContextMenus.tsx b/src/lib/ContextMenus.tsx
index 101b359d..d9b7213c 100644
--- a/src/lib/ContextMenus.tsx
+++ b/src/lib/ContextMenus.tsx
@@ -857,9 +857,7 @@ export default function ContextMenus() {
                             action: "mark_unread",
                             message,
                         });
-                        if (sendPermission) {
-
-
+                        if (channelPermissions & Permission.ManageMessages) {
                             if (message.is_pinned && channel?.channel_type != "DirectMessage") {
                                 generateAction({
                                     action: "unpin_message",
diff --git a/src/pages/channels/messaging/MessageRenderer.tsx b/src/pages/channels/messaging/MessageRenderer.tsx
index c9ad66a3..7c1a506d 100644
--- a/src/pages/channels/messaging/MessageRenderer.tsx
+++ b/src/pages/channels/messaging/MessageRenderer.tsx
@@ -164,8 +164,6 @@ export default observer(({ last_id, renderer, highlight }: Props) => {
                 previous.masquerade,
             );
         }
-        // console.log(renderer.messages[i].content, 7979)
-
 
         if (message.system?.type as any == "message_pinned" || message.system?.type as any == "message_unpinned") {
             render.push(