diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl
index 1526a2150..2d89bf661 100644
--- a/templates/repo/create.tmpl
+++ b/templates/repo/create.tmpl
@@ -9,36 +9,6 @@
 				</h3>
 				<div class="ui attached segment">
 					{{template "base/alert" .}}
-					<!-- <div class="inline required field {{if .Err_Owner}}error{{end}}">
-						<label>{{.i18n.Tr "repo.owner"}}</label>
-						<div class="ui selection owner dropdown">
-							<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
-							<span class="text" title="{{.ContextUser.Name}}">
-								<img class="ui mini image" src="{{.ContextUser.RelAvatarLink}}">
-								{{.ContextUser.ShortName 20}}
-							</span>
-							<i class="dropdown icon"></i>
-							<div class="menu">
-								<div class="item" data-value="{{.SignedUser.ID}}" title="{{.SignedUser.Name}}">
-									<img class="ui mini image" src="{{.SignedUser.RelAvatarLink}}">
-									{{.SignedUser.ShortName 20}}
-								</div>
-								{{range .Orgs}}
-									<div class="item" data-value="{{.ID}}" title="{{.Name}}">
-										<img class="ui mini image" src="{{.RelAvatarLink}}">
-										{{.ShortName 20}}
-									</div>
-								{{end}}
-							</div>
-						</div>
-						<span class="help">{{.i18n.Tr "repo.repo_owner_helper"}}</span>
-					</div>
-
-					<div class="inline required field {{if .Err_RepoName}}error{{end}}">
-						<label for="repo_name">{{.i18n.Tr "repo.repo_name"}}</label>
-						<input id="repo_name" name="repo_name" value="{{.repo_name}}" autofocus required>
-						<span class="help"></span>
-					</div> -->
 					<div class="inline required field">
 						<label for="Alias">项目名称</label>
 						<input id="alias" name="alias" value="" oninput="throttle()" autofocus required>
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index b9195a266..8eb57fc2a 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -13,7 +13,8 @@
 				<input type="hidden" name="action" value="update">
 				<div class="required field {{if .Err_RepoName}}error{{end}}">
 					<label for="repo_name">{{.i18n.Tr "repo.repo_name"}}</label>
-					<input id="repo_name" name="repo_name" value="{{.Repository.Name}}" data-repo-name="{{.Repository.Name}}" autofocus required>
+					<input id="repo_name" name="repo_name" value="{{.Repository.Alias}}" data-repo-name="{{.Repository.Alias}}" autofocus required>
+					<input  type="hidden" name="alias" value="{{.Repository.Name}}" data-repo-name="{{.Repository.Name}}" autofocus required>
 				</div>
 				<div class="inline field">
 					<label>{{.i18n.Tr "repo.repo_size"}}</label>
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index d28f067fd..d859954be 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -21,7 +21,7 @@
 							{{else}}
 								<span class="iconFloat">{{svg "octicon-repo" 16}}</span>
 							{{end}}
-							<a class="name" href="{{AppSubUrl}}/{{$.Owner.Name}}/{{.Name}}">{{$.Owner.Name}}/{{.Name}}</a>
+							<a class="name" href="{{AppSubUrl}}/{{$.Owner.Name}}/{{.Name}}">{{$.Owner.Name}}/{{.DisplayName}}</a>
 							<span>{{SizeFmt .Size}}</span>
 							{{if .IsFork}}
 								{{$.i18n.Tr "repo.forked_from"}}