diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 3b57b22f5..9eb99cb69 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -348,6 +348,8 @@ modify = Update
 [form]
 UserName = Username
 Alias = Repository name
+courseAlias = Course Name
+courseAdress = Course Path
 RepoPath = Repository path
 RepoAdress = Repository Adress
 Email = Email address
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 5180eadaa..77c2c66e3 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -353,6 +353,8 @@ modify=更新
 UserName=用户名
 RepoName=项目路径
 Alias=项目名称
+courseAlias=课程名称
+courseAdress=课程地址
 RepoPath=项目路径
 RepoAdress=项目地址
 Email=邮箱地址
@@ -802,6 +804,7 @@ generate_from=生成自
 repo_desc=项目描述
 repo_lang=项目语言
 repo_gitignore_helper=选择 .gitignore 模板。
+repo_label_helpe=输入完成后回车键完成标签确定。
 issue_labels=任务标签
 issue_labels_helper=选择一个任务标签集
 license=授权许可
diff --git a/routers/repo/course.go b/routers/repo/course.go
index b8f39817b..013ee20da 100644
--- a/routers/repo/course.go
+++ b/routers/repo/course.go
@@ -19,8 +19,9 @@ const (
 
 func CreateCourse(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("new_course")
+	org, _ := models.GetUserByName(setting.Course.OrgName)
 
-	ctx.Data["Owner"] = setting.Course.OrgName
+	ctx.Data["Owner"] = org
 
 	ctx.HTML(200, tplCreateCourse)
 
diff --git a/templates/repo/createCourse.tmpl b/templates/repo/createCourse.tmpl
new file mode 100644
index 000000000..5ce7d010b
--- /dev/null
+++ b/templates/repo/createCourse.tmpl
@@ -0,0 +1,98 @@
+{{template "base/head" .}}
+<div class="repository new repo" style="margin-top: 40px;">
+	<div class="ui middle very relaxed page grid">
+		<div class="column">
+			<form class="ui form" action="{{.Link}}" method="post" id="create_repo_form">
+				{{.CsrfTokenHtml}}
+				<h3 class="ui top attached header">
+					{{.i18n.Tr "new_course"}}
+				</h3>
+				<div class="ui attached segment">
+					{{template "base/alert" .}}
+					<div class="inline required field" >
+                        <label for="Alias">{{.i18n.Tr "form.courseAlias"}}</label>
+                        <input id="alias" name="Alias" value="" autofocus required>
+                        <span class="help">{{.i18n.Tr "form.reponame_dash_dot_error"}}</span>
+                    </div>
+                
+                    <div class="inline required fields" style="margin-bottom: 0;">
+                        <label style="text-align: right;width: 250px!important;word-wrap: break-word;">{{.i18n.Tr "form.courseAdress"}}</label>
+                        <div class="required field {{if .Err_Owner}}error{{end}}" style="padding: 0;">
+                            <div class="ui selection owner dropdown" id="ownerDropdown">
+                                <input type="hidden" id="uid" name="uid" value="{{.Owner.Name}}" required>
+                                <div class="text"  title="{{.Owner.Name}}">
+                                    <img class="ui mini image" src="{{.Owner.RelAvatarLink}}">
+                                    {{$.Owner.Name}}
+                                </div>
+                            </div>
+                        </div>
+                         <div class="ui interval" style="width: 0.6em;font-size: 2rem;line-height: 0px;text-align: center;">/</div>
+                        <div class="required field {{if .Err_RepoName}}error{{end}}">
+                            <input style="width: 100% !important;" id="repo_name" name="RepoName" value="{{.repo_name}}" autofocus required>
+                        </div>
+                    </div>
+                    <span style="display: block;margin-bottom: 1em;" class="help">{{.i18n.Tr "form.repoadd_dash_dot_error"}}</span>
+                    <div class="inline field" id="repoAdress" style="display: none;word-break: break-all;">
+                        <label for="">{{.i18n.Tr "form.RepoAdress"}}:</label>
+                        <span></span>
+                    </div>
+
+                    <div class="inline required field">
+                        <label>{{.i18n.Tr "repo.model.manage.label"}}</label>
+                        <div class="ui multiple search selection dropdown">
+                            <input type="hidden" name="Topics" value="">
+                            <div class="default text">{{.i18n.Tr "repo.repo_label_helpe"}}</div>
+                            <div class="menu" id="course_label_item">
+                            </div>
+                        </div>
+                    </div>
+
+					<div class="inline field {{if .Err_Description}}error{{end}}">
+						<label for="description">{{.i18n.Tr "repo.repo_desc"}}</label>
+						<textarea id="description" name="Description" maxlength="254">{{.description}}</textarea>
+					</div>
+					<div class="inline field">
+						<label></label>
+						<button class="ui green button" id="submit_reponame">
+							{{.i18n.Tr "new_course"}}
+						</button>
+						<a class="ui button" href="{{AppSubUrl}}/">{{.i18n.Tr "cancel"}}</a>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
+</div>
+{{template "base/footer" .}}
+
+<script>
+
+$(document).ready(function(){
+    $('.ui.multiple.search.selection.dropdown')
+    .dropdown({
+        allowAdditions: true,
+        onChange: function(value, text, $selectedItem) {
+            $('#course_label_item').empty()
+        }
+    })
+    $('input.search').bind('input propertychange', function (event) {
+        const query  = $('input.search').val()
+        if(!query){
+            $('#course_label_item').empty()
+        }else{
+            $.get(`/api/v1/topics/search?q=${query}`,(data)=>{
+                console.log(data)
+                if(data.topics.length!==0){
+                    let html=''
+                    $('#course_label_item').empty()
+                    data.topics.forEach(element => {
+                        html += `<div class="item" data-value="${element.topic_name}">${element.topic_name}</div>`
+                    });
+                    $('#course_label_item').append(html)
+                }
+            })
+        }
+    });
+})
+
+</script>
\ No newline at end of file