diff --git a/gogs.go b/gogs.go
index 2f5b24176e..28b0feccb2 100644
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.5.4.0925 Beta"
+const APP_VER = "0.5.4.0926 Beta"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
diff --git a/models/user.go b/models/user.go
index f327ed1440..8aa349c8a8 100644
--- a/models/user.go
+++ b/models/user.go
@@ -521,8 +521,17 @@ type UserCommit struct {
 	*git.Commit
 }
 
-// ValidCommitsWithEmails checks if authors' e-mails of commits are correcponding to users.
-func ValidCommitsWithEmails(oldCommits *list.List) *list.List {
+// ValidateCommitWithEmail chceck if author's e-mail of commit is corresponsind to a user.
+func ValidateCommitWithEmail(c *git.Commit) (uname string) {
+	u, err := GetUserByEmail(c.Author.Email)
+	if err == nil {
+		uname = u.Name
+	}
+	return uname
+}
+
+// ValidateCommitsWithEmails checks if authors' e-mails of commits are corresponding to users.
+func ValidateCommitsWithEmails(oldCommits *list.List) *list.List {
 	emails := map[string]string{}
 	newCommits := list.New()
 	e := oldCommits.Front()
diff --git a/routers/repo/commit.go b/routers/repo/commit.go
index 512df2534f..9791cc5511 100644
--- a/routers/repo/commit.go
+++ b/routers/repo/commit.go
@@ -61,7 +61,7 @@ func Commits(ctx *middleware.Context) {
 		ctx.Handle(500, "CommitsByRange", err)
 		return
 	}
-	commits = models.ValidCommitsWithEmails(commits)
+	commits = models.ValidateCommitsWithEmails(commits)
 
 	ctx.Data["Commits"] = commits
 	ctx.Data["Username"] = userName
@@ -99,7 +99,7 @@ func SearchCommits(ctx *middleware.Context) {
 		ctx.Handle(500, "SearchCommits", err)
 		return
 	}
-	commits = models.ValidCommitsWithEmails(commits)
+	commits = models.ValidateCommitsWithEmails(commits)
 
 	ctx.Data["Keyword"] = keyword
 	ctx.Data["Username"] = userName
diff --git a/routers/repo/view.go b/routers/repo/view.go
index 4e4a7b18ce..82f3460029 100644
--- a/routers/repo/view.go
+++ b/routers/repo/view.go
@@ -11,6 +11,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/base"
 	"github.com/gogits/gogs/modules/git"
 	"github.com/gogits/gogs/modules/log"
@@ -130,20 +131,20 @@ func Home(ctx *middleware.Context) {
 			if te.Type != git.COMMIT {
 				c, err := ctx.Repo.Commit.GetCommitOfRelPath(filepath.Join(treePath, te.Name()))
 				if err != nil {
-					ctx.Handle(404, "GetCommitOfRelPath", err)
+					ctx.Handle(500, "GetCommitOfRelPath", err)
 					return
 				}
 				files = append(files, []interface{}{te, c})
 			} else {
 				sm, err := ctx.Repo.Commit.GetSubModule(path.Join(treename, te.Name()))
 				if err != nil {
-					ctx.Handle(404, "GetSubModule", err)
+					ctx.Handle(500, "GetSubModule", err)
 					return
 				}
 
 				c, err := ctx.Repo.Commit.GetCommitOfRelPath(filepath.Join(treePath, te.Name()))
 				if err != nil {
-					ctx.Handle(404, "GetCommitOfRelPath", err)
+					ctx.Handle(500, "GetCommitOfRelPath", err)
 					return
 				}
 				files = append(files, []interface{}{te, git.NewSubModuleFile(c, sm.Url, te.Id.String())})
@@ -195,6 +196,18 @@ func Home(ctx *middleware.Context) {
 				}
 			}
 		}
+
+		lastCommit := ctx.Repo.Commit
+		if len(treePath) > 0 {
+			c, err := ctx.Repo.Commit.GetCommitOfRelPath(treePath)
+			if err != nil {
+				ctx.Handle(500, "GetCommitOfRelPath", err)
+				return
+			}
+			lastCommit = c
+		}
+		ctx.Data["LastCommit"] = lastCommit
+		ctx.Data["LastCommitUser"] = models.ValidateCommitWithEmail(lastCommit)
 	}
 
 	ctx.Data["Username"] = userName
@@ -215,7 +228,6 @@ func Home(ctx *middleware.Context) {
 		}
 	}
 
-	ctx.Data["LastCommit"] = ctx.Repo.Commit
 	ctx.Data["Paths"] = Paths
 	ctx.Data["TreeName"] = treename
 	ctx.Data["Treenames"] = treenames
diff --git a/templates/.VERSION b/templates/.VERSION
index 87b06b8162..59eee24b76 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.5.4.0925 Beta
\ No newline at end of file
+0.5.4.0926 Beta
\ No newline at end of file
diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl
index 850c761641..e6c43d9e40 100644
--- a/templates/repo/view_list.tmpl
+++ b/templates/repo/view_list.tmpl
@@ -4,7 +4,7 @@
         <th colspan="4" class="clear">
             <span class="author left">
                 <img class="avatar-24 radius" src="{{AvatarLink .LastCommit.Author.Email}}" />
-                <a href="{{AppSubUrl}}/user/email2user?email={{.LastCommit.Author.Email}}"><strong>{{.LastCommit.Author.Name}}</strong>:</a>
+                {{if .LastCommitUser}}<a href="{{AppSubUrl}}/{{.LastCommitUser}}">{{end}}<strong>{{.LastCommit.Author.Name}}</strong>:{{if .LastCommitUser}}</a>{{end}}
             </span>
             <span class="last-commit"><a href="{{.RepoLink}}/commit/{{.LastCommit.Id}}" rel="nofollow">
                 <strong>{{ShortSha .LastCommit.Id.String}}</strong></a>