diff --git a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java
index 88cc91c..cf5813d 100644
--- a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java
@@ -16,21 +16,21 @@ public class AvatarCommand implements Command {
         if (args.length == 0) {
             Member member = event.getMember();
             event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
-                    .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.avatar.success.title") + member.getUser().getAsTag())
+                    .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.avatar.success.title", member.getUser().getAsTag()))
                     .setImage(member.getUser().getAvatarUrl())
                     .setFooter(member.getUser().getAsTag())
                     .build()).queue();
         } else if (event.getMessage().getMentionedMembers().size() == 1) {
             Member member = event.getMessage().getMentionedMembers().get(0);
             event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
-                    .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.avatar.success.title") + member.getUser().getAsTag())
+                    .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.avatar.success.title", member.getUser().getAsTag()))
                     .setImage(member.getUser().getAvatarUrl())
                     .setFooter(member.getUser().getAsTag())
                     .build()).queue();
         } else if (args[0].length() == 18){
             Member member = event.getGuild().getMemberById(args[0]);
             event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
-                    .setTitle("Avatar of " + member.getUser().getAsTag())
+                    .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.avatar.success.title", member.getUser().getAsTag()))
                     .setImage(member.getUser().getAvatarUrl())
                     .setFooter(member.getUser().getAsTag())
                     .build()).queue();
diff --git a/src/main/java/com/bbn/hadder/utils/MessageEditor.java b/src/main/java/com/bbn/hadder/utils/MessageEditor.java
index b514d6d..db7dc1c 100644
--- a/src/main/java/com/bbn/hadder/utils/MessageEditor.java
+++ b/src/main/java/com/bbn/hadder/utils/MessageEditor.java
@@ -66,4 +66,9 @@ public class MessageEditor {
         Locale locale = new Locale(language_code);
         return ResourceBundle.getBundle("Translations/Translations", locale).getString(string).replaceAll("%prefix%", "h.");
     }
+
+    public static String handle(String language_code, String string, String extra) {
+        Locale locale = new Locale(language_code);
+        return ResourceBundle.getBundle("Translations/Translations", locale).getString(string).replaceAll("%prefix%", "h.").replaceAll("%extra%", extra);
+    }
 }
diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties
index 3c71039..7a7fc32 100644
--- a/src/main/resources/Translations/Translations_en.properties
+++ b/src/main/resources/Translations/Translations_en.properties
@@ -19,7 +19,7 @@ error = Error
 none = None
 success! = Success!
 
-commands.fun.avatar.success.title = Avatar of 
+commands.fun.avatar.success.title = Avatar of %extra%
 commands.fun.avatar.help.description = Sends the avatar of the specified member.
 commands.fun.gif.error.description = Please try again with another term.
 commands.fun.gif.help.description = Look for a GIF on Giphy
@@ -117,4 +117,4 @@ commands.moderation.link.help.description = Links two or more servers.
 commands.moderation.nick.success.title = ? Successfully nicked ?
 commands.moderation.nick.success.description = I successfully nicked 
 commands.moderation.nick.myself.success.description = I successfully changed my nickname.
-commands.moderation.nick.help.description = Rename a one or more user.
\ No newline at end of file
+commands.moderation.nick.help.description = Rename a one or more user.