diff --git a/src/main/scala/util/JGitUtil.scala b/src/main/scala/util/JGitUtil.scala
index 8d9b6eb..bf8c0a7 100644
--- a/src/main/scala/util/JGitUtil.scala
+++ b/src/main/scala/util/JGitUtil.scala
@@ -43,8 +43,10 @@
    * @param message the last commit message
    * @param commitId the last commit id
    * @param committer the last committer name
+   * @param mailAddress the committer's mail address
    */
-  case class FileInfo(id: ObjectId, isDirectory: Boolean, name: String, time: Date, message: String, commitId: String, committer: String)
+  case class FileInfo(id: ObjectId, isDirectory: Boolean, name: String, time: Date, message: String, commitId: String,
+                      committer: String, mailAddress: String)
 
   /**
    * The commit data.
@@ -52,14 +54,18 @@
    * @param id the commit id
    * @param time the commit time
    * @param committer  the committer name
+   * @param mailAddress the committer's mail address
    * @param shortMessage the short message
    * @param fullMessage the full message
    * @param parents the list of parent commit id
    */
-  case class CommitInfo(id: String, time: Date, committer: String, shortMessage: String, fullMessage: String, parents: List[String]){
+  case class CommitInfo(id: String, time: Date, committer: String, mailAddress: String,
+                        shortMessage: String, fullMessage: String, parents: List[String]){
     
     def this(rev: org.eclipse.jgit.revwalk.RevCommit) = this(
-        rev.getName, rev.getCommitterIdent.getWhen, rev.getCommitterIdent.getName, rev.getShortMessage, rev.getFullMessage,
+        rev.getName, rev.getCommitterIdent.getWhen,
+        rev.getCommitterIdent.getName, rev.getCommitterIdent.getEmailAddress,
+        rev.getShortMessage, rev.getFullMessage,
         rev.getParents().map(_.name).toList)
 
     val summary = {
@@ -233,7 +239,8 @@
         commits(path).getCommitterIdent.getWhen,
         commits(path).getShortMessage,
         commits(path).getName,
-        commits(path).getCommitterIdent.getName)
+        commits(path).getCommitterIdent.getName,
+        commits(path).getCommitterIdent.getEmailAddress)
     }.sortWith { (file1, file2) =>
       (file1.isDirectory, file2.isDirectory) match {
         case (true , false) => true
diff --git a/src/main/scala/view/helpers.scala b/src/main/scala/view/helpers.scala
index 74d06bf..9b4f09c 100644
--- a/src/main/scala/view/helpers.scala
+++ b/src/main/scala/view/helpers.scala
@@ -79,13 +79,26 @@
       .replaceAll("(^|\\W)([a-f0-9]{40})(\\W|$)", s"""$$1<a href="${context.path}/${repository.owner}/${repository.name}/commit/$$2">$$2</a>$$3"""))
 
 
+  def user(userName: String, mailAddress: String, styleClass: String = "")(implicit context: app.Context): Html = {
+    val account = context.cache(s"account.${mailAddress}"){
+      new AccountService {}.getAccountByMailAddress(mailAddress)
+    }
+    account.map { account =>
+      Html(s"""<a href="${url(account.userName)}" class="${styleClass}">${userName}</a>""")
+    } getOrElse Html(userName)
+  }
+
   /**
    * Returns &lt;img&gt; which displays the avatar icon.
    * Looks up Gravatar if avatar icon has not been configured in user settings.
    */
   def avatar(userName: String, size: Int, tooltip: Boolean = false)(implicit context: app.Context): Html = {
     val account = context.cache(s"account.${userName}"){
-      new AccountService {}.getAccountByUserName(userName)
+      if(userName.contains("@")){
+        new AccountService {}.getAccountByMailAddress(userName)
+      } else {
+        new AccountService {}.getAccountByUserName(userName)
+      }
     }
     val src = account.collect { case account if(account.image.isEmpty) =>
       s"""http://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress)}?s=${size}"""
diff --git a/src/main/twirl/repo/blob.scala.html b/src/main/twirl/repo/blob.scala.html
index a35d9b4..cd47e59 100644
--- a/src/main/twirl/repo/blob.scala.html
+++ b/src/main/twirl/repo/blob.scala.html
@@ -23,7 +23,8 @@
     <tr>
       <th style="font-weight: normal;">
         <div class="pull-left">
-          <a href="@url(latestCommit.committer)" class="username strong">@latestCommit.committer</a>
+          @avatar(latestCommit.mailAddress, 20)
+          @user(latestCommit.committer, latestCommit.mailAddress, "username strong")
           <span class="muted">@datetime(latestCommit.time)</span>
           <a href="@url(repository)/commit/@latestCommit.id" class="commit-message">@link(latestCommit.summary, repository)</a>
         </div>
diff --git a/src/main/twirl/repo/commit.scala.html b/src/main/twirl/repo/commit.scala.html
index 60a872b..5a05711 100644
--- a/src/main/twirl/repo/commit.scala.html
+++ b/src/main/twirl/repo/commit.scala.html
@@ -43,8 +43,8 @@
     </tr>
     <tr>
       <td>
-        @avatar(commit.committer, 20)
-        <a href="@url(commit.committer)" class="username strong">@commit.committer</a>
+        @avatar(commit.mailAddress, 20)
+        @user(commit.committer, commit.mailAddress, "username strong")
         <span class="muted">@datetime(commit.time)</span>
         <div class="pull-right monospace small" style="text-align: right;">
           <div>
diff --git a/src/main/twirl/repo/commits.scala.html b/src/main/twirl/repo/commits.scala.html
index 0a6e6aa..7955c1e 100644
--- a/src/main/twirl/repo/commits.scala.html
+++ b/src/main/twirl/repo/commits.scala.html
@@ -38,7 +38,7 @@
             <a href="@url(repository)/tree/@commit.id" class="small">Browse code</a>
           </div>
           <div>
-            <div class="commit-avatar-image">@avatar(commit.committer, 40)</div>
+            <div class="commit-avatar-image">@avatar(commit.mailAddress, 40)</div>
             <a href="@url(repository)/commit/@commit.id" class="commit-message" style="font-weight: bold;">@link(commit.summary, repository)</a>
             @if(commit.description.isDefined){
               <a href="javascript:void(0)" onclick="$('#description-@commit.id').toggle();" class="omit">...</a>
@@ -48,7 +48,7 @@
               <pre id="description-@commit.id" style="display: none;" class="commit-description">@link(commit.description.get, repository)</pre>
             }
             <div class="small">
-              <a href="@url(commit.committer)" class="username">@commit.committer</a>
+              @user(commit.committer, commit.mailAddress, "username")
               <span class="muted">@datetime(commit.time)</span>
             </div>
           </div>
diff --git a/src/main/twirl/repo/files.scala.html b/src/main/twirl/repo/files.scala.html
index 1cb2434..1b69fe3 100644
--- a/src/main/twirl/repo/files.scala.html
+++ b/src/main/twirl/repo/files.scala.html
@@ -36,8 +36,8 @@
       <tr>
         <td colspan="4" class="latest-commit">
           <div>
-            @avatar(latestCommit.committer, 20)
-            <a href="@url(latestCommit.committer)" class="username strong">@latestCommit.committer</a>
+            @avatar(latestCommit.mailAddress, 20)
+            @user(latestCommit.committer, latestCommit.mailAddress, "username strong")
             <span class="muted">@datetime(latestCommit.time)</span>
             <div class="pull-right align-right monospace">
               <a href="@url(repository)/commit/@latestCommit.id" class="commit-id"><span class="muted">latest commit</span> @latestCommit.id.substring(0, 10)</a>
@@ -70,7 +70,10 @@
         }
         </td>
         <td>@datetime(file.time)</td>
-        <td><a href="@url(repository)/commit/@file.commitId" class="commit-message">@link(file.message, repository)</a> [<a href="@url(file.committer)">@file.committer</a>]</td>
+        <td>
+          <a href="@url(repository)/commit/@file.commitId" class="commit-message">@link(file.message, repository)</a>
+          [@user(file.committer, file.mailAddress)]
+        </td>
       </tr>
       }
     </table>