diff --git a/models/repo.go b/models/repo.go
index 93e2cb140..964bf7c36 100755
--- a/models/repo.go
+++ b/models/repo.go
@@ -572,6 +572,19 @@ func (repo *Repository) GetOwner() error {
 	return repo.getOwner(x)
 }
 
+func (repo *Repository) getCreator(e Engine) (err error) {
+	if repo.CreatorID == 0 {
+		return nil
+	}
+
+	repo.Creator, err = getUserByID(e, repo.CreatorID)
+	return err
+}
+
+func (repo *Repository) GetCreator() error {
+	return repo.getCreator(x)
+}
+
 func (repo *Repository) mustOwner(e Engine) *User {
 	if err := repo.getOwner(e); err != nil {
 		return &User{
diff --git a/services/repository/repository.go b/services/repository/repository.go
index 86ee9370e..f43a3c62d 100644
--- a/services/repository/repository.go
+++ b/services/repository/repository.go
@@ -128,7 +128,12 @@ func GetRecommendRepoFromPromote(filename string) ([]map[string]interface{}, err
 				repoMap["ID"] = fmt.Sprint(repo.ID)
 				repoMap["Name"] = repo.Name
 				repoMap["Alias"] = repo.Alias
-				repoMap["Creator"] = repo.Creator
+				if repo.RepoType == models.RepoCourse {
+					//Load creator
+					repo.GetCreator()
+					repoMap["Creator"] = repo.Creator
+				}
+
 				repoMap["OwnerName"] = repo.OwnerName
 				repoMap["NumStars"] = repo.NumStars
 				repoMap["NumForks"] = repo.NumForks