diff --git a/commands/message/info/user.js b/commands/message/info/user.js
index 9c503b4..1a374d8 100644
--- a/commands/message/info/user.js
+++ b/commands/message/info/user.js
@@ -34,8 +34,11 @@ module.exports = {
       if(u.bot) botTag = ""
       if(u.hasFlag(UserFlags.VERIFIED_BOT)) botTag = ""
 
+      let usernameDisplay = u.name
+      if(u.discriminator && u.discriminator !== "0") usernameDisplay += `#${u.discriminator}`
+
       let userCard = createEmbed("default", context, {
-        description: `${icon("person")} **${u.name}#${u.discriminator}**${botTag} ${highlight(`(${u.id})`)}`,
+        description: `${icon("person")} **${usernameDisplay}**${botTag} ${highlight(`(${u.id})`)}`,
         thumbnail: {
           url: u.avatarUrl + `?size=4096`
         },
diff --git a/labscore/utils/users.js b/labscore/utils/users.js
index 2a041ed..3e0570f 100644
--- a/labscore/utils/users.js
+++ b/labscore/utils/users.js
@@ -1,6 +1,7 @@
 async function getUser(context, query){
   let user;
   let member;
+  if(query == "@me") query = context.user.id;
   if(/[0-9]{17,19}/.test(query)){
     let uid = query.match(/[0-9]{17,19}/)
     try{
@@ -18,6 +19,7 @@ async function getUser(context, query){
 
 async function getMember(context, query){
   if(!context.guild) return;
+  if(query == "@me") query = context.author.id;
   if(/[0-9]{17,19}/.test(query)){
     let uid = query.match(/[0-9]{17,19}/)
     try{