diff --git a/src/main/scala/gitbucket/core/controller/AccountController.scala b/src/main/scala/gitbucket/core/controller/AccountController.scala
index b72c9a9..4ec3407 100644
--- a/src/main/scala/gitbucket/core/controller/AccountController.scala
+++ b/src/main/scala/gitbucket/core/controller/AccountController.scala
@@ -151,16 +151,16 @@
   get("/:userName/_avatar"){
     val userName = params("userName")
     contentType = "image/png"
-    getAccountByUserName(userName).map{ account =>
+    getAccountByUserName(userName).flatMap{ account =>
       response.setDateHeader("Last-Modified", account.updatedDate.getTime)
       account.image.map{ image =>
-        RawData(FileUtil.getMimeType(image), new java.io.File(getUserUploadDir(userName), image))
+        Some(RawData(FileUtil.getMimeType(image), new java.io.File(getUserUploadDir(userName), image)))
       }.getOrElse{
-        (if (account.isGroupAccount) {
+        if (account.isGroupAccount) {
           TextAvatarUtil.textGroupAvatar(account.fullName)
         } else {
           TextAvatarUtil.textAvatar(account.fullName)
-        }).get
+        }
       }
     }.getOrElse{
       response.setHeader("Cache-Control", "max-age=3600")