diff --git a/app/dragon-bot.py b/app/dragon-bot.py
index d2be402e..c6ff2a3b 100644
--- a/app/dragon-bot.py
+++ b/app/dragon-bot.py
@@ -81,6 +81,18 @@ async def on_message(message):
             eight_ball.check_8ball(message.content)
         )
 
+    if (message.content.startswith('!avatar') and message.mentions.__len__() > 0 ):
+        # Code stolen from this reddit post
+        # https://www.reddit.com/r/discordapp/comments/74bb4z/retrieve_a_mentioned_users_avatar_using_discordpy/
+        for user in message.mentions:
+            embed = discord.Embed(
+                title="{}#{}".format(user.name,user.discriminator),
+                description="[Direct Link]({})".format(user.avatar_url),
+                type='rich'
+            )
+            embed.set_image(url=user.avatar_url)
+            await client.send_message(message.channel, embed=embed)
+
     if message.content.startswith('!cleanup'):
         if not role_check.cleanup_permissions(message.author.roles):
             await client.send_message(message.channel, 'You cant do that')