diff --git a/src/main/scala/view/AvatarImageProvider.scala b/src/main/scala/view/AvatarImageProvider.scala
index bd1703d..28cf7f3 100644
--- a/src/main/scala/view/AvatarImageProvider.scala
+++ b/src/main/scala/view/AvatarImageProvider.scala
@@ -12,8 +12,13 @@
    */
   protected def getAvatarImageHtml(userName: String, size: Int,
       mailAddress: String = "", tooltip: Boolean = false)(implicit context: app.Context): Html = {
-    val src = getAccountByUserName(userName).collect { case account if(account.image.isEmpty) =>
-      s"""http://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress)}?s=${size}"""
+
+    val src = getAccountByUserName(userName).map { account =>
+      if(account.image.isEmpty){
+        s"""http://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress)}?s=${size}"""
+      } else {
+        s"""${context.path}/${userName}/_avatar"""
+      }
     } getOrElse {
       if(mailAddress.nonEmpty){
         s"""http://www.gravatar.com/avatar/${StringUtil.md5(mailAddress)}?s=${size}"""