diff --git a/src/main/resources/noimage.png b/src/main/resources/noimage.png
new file mode 100644
index 0000000..6427ccd
--- /dev/null
+++ b/src/main/resources/noimage.png
Binary files differ
diff --git a/src/main/scala/app/AccountController.scala b/src/main/scala/app/AccountController.scala
index 5cfaf29..fee400f 100644
--- a/src/main/scala/app/AccountController.scala
+++ b/src/main/scala/app/AccountController.scala
@@ -55,7 +55,10 @@
     getAccountByUserName(userName).flatMap(_.image).map { image =>
       contentType = FileUtil.getMimeType(image)
       new java.io.File(getUserUploadDir(userName), image)
-    } getOrElse NotFound
+    } getOrElse {
+      contentType = "image/png"
+      Thread.currentThread.getContextClassLoader.getResourceAsStream("noimage.png")
+    }
   }
 
   get("/:userName/_edit")(oneselfOnly {
diff --git a/src/main/twirl/account/edit.scala.html b/src/main/twirl/account/edit.scala.html
index b4f1b2e..ecd24c2 100644
--- a/src/main/twirl/account/edit.scala.html
+++ b/src/main/twirl/account/edit.scala.html
@@ -50,7 +50,7 @@
       }
       <input type="hidden" name="fileId" value=""/>
     </fieldset>
-    <fieldset class="buttons">
+    <fieldset class="margin">
       @if(account.isDefined){
         <input type="submit" class="btn btn-success" value="Save"/>
         <a href="@url(account.get.userName)" class="btn">Cancel</a>
@@ -94,8 +94,4 @@
   width: 120px;
   height: 120px;
 }
-
-fieldset.buttons {
-  margin-top: 20px;
-}
 </style>
\ No newline at end of file
diff --git a/src/main/twirl/account/repositories.scala.html b/src/main/twirl/account/repositories.scala.html
index 61941b8..dbdacf5 100644
--- a/src/main/twirl/account/repositories.scala.html
+++ b/src/main/twirl/account/repositories.scala.html
@@ -6,6 +6,7 @@
     <div class="row-fluid">
       <div class="span4">
         <div class="block">
+          <div class="account-image">@helper.html.avatar(account.userName, 200)</div>
           <div class="block-header">@account.userName</div>
         </div>
         <div class="block">
diff --git a/src/main/twirl/helper/activities.scala.html b/src/main/twirl/helper/activities.scala.html
index cb531c7..e102cdc 100644
--- a/src/main/twirl/helper/activities.scala.html
+++ b/src/main/twirl/helper/activities.scala.html
@@ -7,7 +7,10 @@
   @activities.map { activity =>
     <div class="block">
       <div class="muted small">@datetime(activity.activityDate)</div>
-      <div class="strong">@activityMessage(activity.message)</div>
+      <div class="strong">
+        @helper.html.avatar(activity.activityUserName, 16)
+        @activityMessage(activity.message)
+      </div>
       @activity.additionalInfo.map { additionalInfo =>
         @(activity.activityType match {
           case "create_wiki" => {
diff --git a/src/main/twirl/helper/avatar.scala.html b/src/main/twirl/helper/avatar.scala.html
new file mode 100644
index 0000000..8250a59
--- /dev/null
+++ b/src/main/twirl/helper/avatar.scala.html
@@ -0,0 +1,4 @@
+@(userName: String, size: Int)(implicit context: app.Context)
+@import context._
+@import view.helpers._
+<img src="@url(userName)/_avatar" style="width: @(size)px; height: @(size)px;"/>
\ No newline at end of file
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 84899e6..f1dd451 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -203,6 +203,11 @@
   padding-top: 10px;
 }
 
+div.account-image {
+  text-align: center;
+  margin-bottom: 8px;
+}
+
 /****************************************************************************/
 /* Sign-in form */
 /****************************************************************************/