diff --git a/commands/interaction/slash/info/user.js b/commands/interaction/slash/info/user.js
index 5ee7846..ee365c0 100644
--- a/commands/interaction/slash/info/user.js
+++ b/commands/interaction/slash/info/user.js
@@ -48,31 +48,29 @@ module.exports = {
         m = context.member;
       }
 
-      let botTag = ''
-      if (u.bot) botTag = ""
-      if (u.hasFlag(UserFlags.VERIFIED_BOT)) botTag = ""
-  
-      // We escape underscores to prevent markdown issues
-      let usernameDisplay = u.username.replace(/_/g,'\\_');
-      if (u.discriminator && u.discriminator !== "0") usernameDisplay += `#${u.discriminator}`
-  
-      usernameDisplay = `**@${usernameDisplay}**${botTag} ${highlight(`(${u.id})`)}`
+      let usernameDisplay = u.name
+      if(u.discriminator && u.discriminator !== "0") usernameDisplay += `#${u.discriminator}`
+
+      let cardContent = "";
 
       // Badge Container
       let b = renderBadges(u)
-      if(b.length >= 1) usernameDisplay += `\n${b.join('')}\n`
+      if(b.length >= 1) cardContent += `\n${b.join('')}\n`
 
-      if(u.globalName !== null) usernameDisplay += `\n${smallIconPill("user_card", "Display Name")} ${smallPill(u.globalName)}`
-      if (m && m.nick !== null) usernameDisplay += `\n${smallIconPill("user_card", "Nickname")} ${smallPill(m.nick)}`
-      if (u.clan && u.clan.tag !== null) usernameDisplay += `\n${smallIconPill("shield", "Clan")} ${smallPill(u.clan.tag)}`
-  
-      if(u.hasFlag(1<<23)) usernameDisplay += `\n-# Provisional Account`
+      cardContent += `\n${smallIconPill("id", "User ID")} ${smallPill(u.id)}`;
+      if(u.globalName !== null) cardContent += `\n${smallIconPill("user_card", "Display Name")} ${smallPill(u.globalName)}`
+      if(m && m.nick !== null) cardContent += `\n${smallIconPill("user_card", "Nickname")} ${smallPill(m.nick)}`
+      if (u.clan && u.clan.tag !== null) cardContent += `\n${smallIconPill("shield", "Clan")} ${smallPill(u.clan.tag)}`
+
+      if(u.hasFlag(1<<23)) cardContent += `\n-# Provisional Account`
 
       let userCard = createEmbed("default", context, {
-        description: `${icon("user")} ${usernameDisplay}`,
-        thumbnail: {
-          url: getUserAvatar(u)
+        author: {
+          name: usernameDisplay,
+          iconUrl: getUserAvatar(u),
+          url: `https://discord.com/users/${u.id}`
         },
+        description: `${cardContent}`,
         fields: [{
           name: `${icon("calendar")} Dates`,
           value: `**Account Created: **${timestamp(u.createdAt, "f")}`,
diff --git a/commands/interaction/user/user.js b/commands/interaction/user/user.js
index 2ab2622..2952445 100644
--- a/commands/interaction/user/user.js
+++ b/commands/interaction/user/user.js
@@ -30,31 +30,29 @@ module.exports = {
       let u = await context.client.rest.fetchUser(user.id);;
       let m = member;
   
-      let botTag = ''
-      if (u.bot) botTag = ""
-      if (u.hasFlag(UserFlags.VERIFIED_BOT)) botTag = ""
-  
-      // We escape underscores to prevent markdown issues
-      let usernameDisplay = u.name.replace(/_/g,'\\_');
-      if (u.discriminator && u.discriminator !== "0") usernameDisplay += `#${u.discriminator}`
-  
-      usernameDisplay = `**@${usernameDisplay}**${botTag} ${highlight(`(${u.id})`)}`
-      
+      let usernameDisplay = u.name
+      if(u.discriminator && u.discriminator !== "0") usernameDisplay += `#${u.discriminator}`
+
+      let cardContent = "";
+
       // Badge Container
       let b = renderBadges(u)
-      if(b.length >= 1) usernameDisplay += `\n${b.join('')}\n`
+      if(b.length >= 1) cardContent += `\n${b.join('')}\n`
+
+      cardContent += `\n${smallIconPill("id", "User ID")} ${smallPill(u.id)}`;
+      if(u.globalName !== null) cardContent += `\n${smallIconPill("user_card", "Display Name")} ${smallPill(u.globalName)}`
+      if(m && m.nick !== null) cardContent += `\n${smallIconPill("user_card", "Nickname")} ${smallPill(m.nick)}`
+      if (u.clan && u.clan.tag !== null) cardContent += `\n${smallIconPill("shield", "Clan")} ${smallPill(u.clan.tag)}`
+
+      if(u.hasFlag(1<<23)) cardContent += `\n-# Provisional Account`
 
-      if(u.globalName !== null) usernameDisplay += `\n${smallIconPill("user_card", "Display Name")} ${smallPill(u.globalName)}`
-      if (m && m.nick !== null) usernameDisplay += `\n${smallIconPill("user_card", "Nickname")} ${smallPill(m.nick)}`
-      if (u.clan && u.clan.tag !== null) usernameDisplay += `\n${smallIconPill("shield", "Clan")} ${smallPill(u.clan.tag)}`
-  
-      if(u.hasFlag(1<<23)) usernameDisplay += `\n-# Provisional Account`
-      
       let userCard = createEmbed("default", context, {
-        description: `${icon("user")} ${usernameDisplay}`,
-        thumbnail: {
-          url: getUserAvatar(u)
+        author: {
+          name: usernameDisplay,
+          iconUrl: getUserAvatar(u),
+          url: `https://discord.com/users/${u.id}`
         },
+        description: `${cardContent}`,
         fields: [{
           name: `${icon("calendar")} Dates`,
           value: `**Account Created: **${timestamp(u.createdAt, "f")}`,
diff --git a/commands/message/info/user.js b/commands/message/info/user.js
index 8b424c4..a8c8966 100644
--- a/commands/message/info/user.js
+++ b/commands/message/info/user.js
@@ -38,13 +38,7 @@ module.exports = {
       
       // User Card
 
-      // TODO: create bot tag emoji for this
-      let botTag = ''
-      if(u.bot) botTag = ""
-      if(u.hasFlag(UserFlags.VERIFIED_BOT)) botTag = ""
-
-      // We escape underscores to prevent markdown issues
-      let usernameDisplay = u.name.replace(/_/g,'\\_');
+      let usernameDisplay = u.name
       if(u.discriminator && u.discriminator !== "0") usernameDisplay += `#${u.discriminator}`
 
       let cardContent = "";