diff --git a/src/commands/fun/whois.ts b/src/commands/fun/whois.ts
index a30e9c0..1d1dff2 100644
--- a/src/commands/fun/whois.ts
+++ b/src/commands/fun/whois.ts
@@ -56,7 +56,7 @@ export default new NamedCommand({
         const id = author.id;
 
         if (id in registry) {
-            send(registry[id]);
+            send(`${author} ${registry[id]}`, {allowedMentions: {parse: []}});
         } else {
             send("You haven't been added to the registry yet!");
         }
@@ -68,9 +68,9 @@ export default new NamedCommand({
             const id = user.id;
 
             if (id in registry) {
-                send(registry[id]);
+                send(`${user} ${registry[id]}`, {allowedMentions: {parse: []}});
             } else {
-                send(`\`${user.tag}\` hasn't been added to the registry yet!`);
+                send(`${user} hasn't been added to the registry yet!`, {allowedMentions: {parse: []}});
             }
         }
     }),
@@ -80,9 +80,9 @@ export default new NamedCommand({
 
             if (typeof user !== "string") {
                 if (user.id in registry) {
-                    send(registry[user.id]);
+                    send(`${user} ${registry[user.id]}`, {allowedMentions: {parse: []}});
                 } else {
-                    send(`\`${user.tag}\` hasn't been added to the registry yet!`);
+                    send(`${user} hasn't been added to the registry yet!`, {allowedMentions: {parse: []}});
                 }
             } else {
                 send(user);