diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index c0803ed06..03d2d832a 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -195,8 +195,11 @@ func CreatePost(ctx *context.Context, form auth.CreateRepoForm) {
 	}
 	ctx.Data["ContextUser"] = ctxUser
 	if !form.AutoAgree {
+		ctx.Data["CheckedAutoAgree"] = ""
 		ctx.RenderWithErr(ctx.Tr("repo.template.one_promise"), tplCreate, form)
 		return
+	} else {
+		ctx.Data["CheckedAutoAgree"] = "checked"
 	}
 	if ctx.HasError() {
 		ctx.HTML(200, tplCreate)
diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl
index cf4c1a16a..be1f292d0 100644
--- a/templates/repo/create.tmpl
+++ b/templates/repo/create.tmpl
@@ -81,7 +81,7 @@
 							</div>
 						</div>
 						<div class="inline field">
-							<div class="ui checkbox" id="auto-init">
+							<div class="ui checkbox {{.CheckedAutoAgree}}" id="auto-init">
 								<input class="hidden" name="auto_agree" type="checkbox">
 								<label
 									style="width: 76%;text-align: justify;line-height: 1.5;">{{.i18n.Tr "repo.use_repo_agreement"}}
@@ -160,7 +160,7 @@
 								placeholder="master">
 						</div>
 						<div class="inline field">
-							<div class="ui checkbox" id="auto-init">
+							<div class="ui checkbox {{.CheckedAutoAgree}}" id="auto-init">
 								<input class="hidden" name="auto_agree" type="checkbox">
 								<label
 									style="width: 76%;text-align: justify;line-height: 1.5;">{{.i18n.Tr "repo.use_repo_agreement"}}