diff --git a/src/main/java/com/diamondfire/helpbot/sys/tag/Tag.java b/src/main/java/com/diamondfire/helpbot/sys/tag/Tag.java
index 7ad5ba67..23a7af75 100644
--- a/src/main/java/com/diamondfire/helpbot/sys/tag/Tag.java
+++ b/src/main/java/com/diamondfire/helpbot/sys/tag/Tag.java
@@ -75,10 +75,11 @@ public void sendResponse(TextChannel channel, User requester) {
         User user = channel.getJDA().retrieveUserById(getAuthorId()).complete();
         
         EmbedBuilder embed = new EmbedBuilder()
-                .setTitle(getTitle()+" (*"+user.getAsTag()+"*)")
+                .setTitle(getTitle())
+                .setAuthor("By "+user.getAsTag())
                 .setDescription(getResponse()+"\n\u200b")
                 .setColor(0x969dba)
-                .setFooter("Executed by "+requester.getAsTag(), user.getAvatarUrl());
+                .setFooter("Executed by "+requester.getAsTag(), requester.getAvatarUrl());
         if (!getImage().equals("")) embed.setImage(getImage());
                 
         channel.sendMessageEmbeds(embed.build()).queue();