diff --git a/models/repo.go b/models/repo.go
index 3311869c0..3e32c831c 100755
--- a/models/repo.go
+++ b/models/repo.go
@@ -947,7 +947,6 @@ func isRepositoryExist(e Engine, u *User, repoName string, alias string) (bool,
 		cond = cond.And(builder.Eq{"lower_name": repoName})
 	}
 	count, err := e.Where(cond).Count(&Repository{})
-	//todo 确定从 && 改成 || 是否有问题
 	return count > 0 || com.IsDir(RepoPath(u.Name, repoName)), err
 }
 
diff --git a/models/repo_list.go b/models/repo_list.go
index d2762d4d3..e41b0f49d 100755
--- a/models/repo_list.go
+++ b/models/repo_list.go
@@ -321,7 +321,7 @@ func SearchRepositoryCondition(opts *SearchRepoOptions) builder.Cond {
 			var likes = builder.NewCond()
 			for _, v := range strings.Split(opts.Keyword, ",") {
 				likes = likes.Or(builder.Like{"lower_name", strings.ToLower(v)})
-				likes = likes.Or(builder.Like{"alias", strings.ToLower(v)})
+				likes = likes.Or(builder.Like{"alias", v})
 				if opts.IncludeDescription {
 					likes = likes.Or(builder.Like{"LOWER(description)", strings.ToLower(v)})
 				}
diff --git a/modules/repository/fork.go b/modules/repository/fork.go
index 2ed2a0eb7..7549c2661 100644
--- a/modules/repository/fork.go
+++ b/modules/repository/fork.go
@@ -33,6 +33,7 @@ func ForkRepository(doer, owner *models.User, oldRepo *models.Repository, name,
 		Owner:         owner,
 		OwnerName:     owner.Name,
 		Name:          name,
+		Alias:         oldRepo.Alias,
 		LowerName:     strings.ToLower(name),
 		Description:   desc,
 		DefaultBranch: oldRepo.DefaultBranch,