diff --git a/src/mami.js/ui/messages.jsx b/src/mami.js/ui/messages.jsx
index 7d338db..5aa04dd 100644
--- a/src/mami.js/ui/messages.jsx
+++ b/src/mami.js/ui/messages.jsx
@@ -37,7 +37,7 @@ Umi.UI.Messages = (function() {
         'kick': { text: '%0 got bludgeoned to death.', action: 'got bludgeoned to death', avatar: 'invert', sound: 'kick' },
         'flood': { text: '%0 got kicked for flood protection.', action: 'got kicked for flood protection', avatar: 'invert', sound: 'flood' },
         'timeout': { text: '%0 exploded.', action: 'exploded', avatar: 'greyscale', sound: 'timeout' },
-        'nick': { text: '%0 changed their name to %1.' },
+        'nick': { text: '%0 changed their name to %1.', action: 'changed their name to %1' },
         'crchan': { text: 'Channel %0 has been created.' },
         'delchan': { text: 'Channel %0 has been deleted.' },
         'cpwdchan': { text: 'Channel password has been changed.' },
@@ -181,7 +181,7 @@ Umi.UI.Messages = (function() {
 
                     let actionSuccess = false;
                     if(typeof bmInfo.action === 'string' && mami.settings.get('fancyInfo')) {
-                        const target = botInfo.target || Umi.Users.FindExact(bArgs[0]);
+                        const target = botInfo.target ?? Umi.Users.FindExact(bArgs[0]) ?? Umi.Users.FindExact('~' + bArgs[0]); // shitty fix for server sending invalid data
 
                         if(target) {
                             actionSuccess = true;
@@ -191,7 +191,7 @@ Umi.UI.Messages = (function() {
 
                             $ari(classes, userClass);
 
-                            msgText = bmInfo.action;
+                            msgText = formatTemplate(bmInfo.action, bArgs);
                             if(typeof bmInfo.avatar === 'string')
                                 avatarClasses.push(`avatar-filter-${bmInfo.avatar}`);
                         }