diff --git a/routers/org/home.go b/routers/org/home.go
index 4eff151bf..c9769f559 100755
--- a/routers/org/home.go
+++ b/routers/org/home.go
@@ -158,6 +158,7 @@ func Home(ctx *context.Context) {
 		for _, tag := range tags {
 			for _, repo := range tag.RepoList {
 				repo.GetCreator()
+				repo.GetOwner()
 			}
 		}
 
diff --git a/templates/org/course_list.tmpl b/templates/org/course_list.tmpl
index 1f4378036..6313ad010 100644
--- a/templates/org/course_list.tmpl
+++ b/templates/org/course_list.tmpl
@@ -128,11 +128,10 @@
                         <!-- <img class="ui avatar" style="width: 22px;height:22px;display:flex;vertical-align: middle;" src="{{.Creator.RelAvatarLink}}"> -->
                         <div class="left aligned author">
                         <!-- <span > -->
-                            <!-- {{.Creator}} -->
-                            {{if .Creator}}
-                                <img class="ui avatar image" style="width: 22px;height:22px;margin-top:-2px"  src="{{.Creator.RelAvatarLink}}"> 
+                            {{if ne .CreatorID 0}}
+                                <img class="ui avatar image" style="width: 22px;height:22px;margin-top:-2px"  src="{{.Creator.RelAvatarLink}}">
                             {{else}}
-                                <img class="ui avatar image" style="width: 22px;height:22px;margin-top:-2px"  src="{{.Owner.RelAvatarLink}}"> 
+                                <img class="ui avatar image" style="width: 22px;height:22px;margin-top:-2px"  src="{{.Owner.RelAvatarLink}}">
                             {{end}}
 
                             {{$.i18n.Tr "org.repo_updated"}}&nbsp;: &nbsp; {{TimeSinceUnixShort .UpdatedUnix}}
diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl
index a06f06c20..70ea9b421 100644
--- a/templates/org/home_courses.tmpl
+++ b/templates/org/home_courses.tmpl
@@ -208,7 +208,11 @@
                                             <div class="content"  style="margin-left: 10px;">
                                                 <a href="{{.Link}}"><strong class="team-name">{{.Alias}}</strong></a>
                                                 <p class="text grey">
+												    {{if ne .CreatorID 0}}
                                                     贡献者：{{.Creator.Name}}
+													{{else}}
+													贡献者：{{.Owner.Name}}
+													{{end}}
                                                 </p>
                                             </div>
                                         </div>