diff --git a/modules/git/repo.go b/modules/git/repo.go
index 386a8909d..a2a4d28af 100644
--- a/modules/git/repo.go
+++ b/modules/git/repo.go
@@ -460,7 +460,7 @@ func GetContributors(repoPath string) ([]Contributor, error){
 			commitCnt, _ := strconv.Atoi(number)
 			committer := oneCount[strings.Index(oneCount, "\t")+1:strings.LastIndex(oneCount, " ")]
 			committer = strings.Trim(committer, " ")
-			email := oneCount[strings.LastIndex(oneCount, " ")+1:]
+			email := oneCount[strings.Index(oneCount, "<")+1:strings.Index(oneCount, ">")]
 			contributorsInfo[i] = Contributor{
 				commitCnt, committer, email,
 			}
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
index 63f80104e..52d819459 100644
--- a/templates/repo/home.tmpl
+++ b/templates/repo/home.tmpl
@@ -180,14 +180,12 @@
 						<div class="ui members">
 							{{range .ContributorInfo}}
 								{{/*<img class="ui avatar image" src="{{.UserInfo.RelAvatarLink}}" alt=""/>&nbsp;&nbsp;<a href="{{AppSubUrl}}/{{.UserInfo.Name}}">{{.UserInfo.Name}}</a>*/}}
-								{{if .Email}}
-								    <img class="ui avatar image" src="{{AvatarLink .Email}}" alt=""/>&nbsp;&nbsp;{{.Email}}
+								{{if .UserInfo}}
+									<a href="{{AppSubUrl}}/{{.UserInfo.Name}}"><img class="ui avatar image" src="{{.UserInfo.RelAvatarLink}}" alt=""/></a>
+								{{else if .Email}}								    
+									<a href="mailto:{{.Email}}"><img class="ui avatar image" src="{{AvatarLink .Email}}" alt=""/></a>
 								{{end}}
 							{{end}}
-							<a href="{{.HomeLink}}" title="{{.Name}}{{if .FullName}} ({{.FullName}}){{end}}"><img class="ui avatar image" src="https://git.openi.org.cn/user/avatar/coral/-1"></a>
-							<a href="{{.HomeLink}}" title="{{.Name}}{{if .FullName}} ({{.FullName}}){{end}}"><img class="ui avatar image" src="https://git.openi.org.cn/user/avatar/dlvc/-1"></a>
-							<a href="{{.HomeLink}}" title="{{.Name}}{{if .FullName}} ({{.FullName}}){{end}}"><img class="ui avatar image" src="https://git.openi.org.cn/user/avatar/fangwei123456/-1"></a>
-							<a href="{{.HomeLink}}" title="{{.Name}}{{if .FullName}} ({{.FullName}}){{end}}"><img class="ui avatar image" src="https://git.openi.org.cn/user/avatar/fisheryu/-1"></a>
 						</div>						
 					</div>