diff --git a/services/issue/issue.go b/services/issue/issue.go
index bc27471d68..eb4d93dbdf 100644
--- a/services/issue/issue.go
+++ b/services/issue/issue.go
@@ -110,7 +110,7 @@ func ChangeTimeEstimate(issue *issues_model.Issue, doer *user_model.User, timeEs
 	issue.TimeEstimate = timeEstimate
 
 	if err = issues_model.ChangeIssueTimeEstimate(issue, doer, timeEstimate); err != nil {
-		return
+		return err
 	}
 
 	return nil
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index ea2ad2fc15..d67ec1d913 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -282,7 +282,7 @@
 			<div>
 					<span class="text"><strong>{{ctx.Locale.Tr "repo.issues.time_estimate"}}</strong></span>
 
-					<form method="POST" id="set_time_estimate_form" class="gt-mt-3" action="{{.Issue.Link}}/time_estimate">
+					<form method="post" id="set_time_estimate_form" class="gt-mt-3" action="{{.Issue.Link}}/time_estimate">
 						{{$.CsrfTokenHtml}}
 							<div class="ui input fluid">
 								<input name="time_estimate" placeholder='{{ctx.Locale.Tr "repo.issues.add_time_estimate"}}' value="{{TimeEstimateToStr .Issue.TimeEstimate}}" data-value="{{$.Issue.TimeEstimate}}" type="text" >
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 492a619a33..b5677c77e0 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -20202,10 +20202,6 @@
           "type": "string",
           "x-go-name": "State"
         },
-        "time_estimate": {
-          "type": "string",
-          "x-go-name": "TimeEstimate"
-        },
         "title": {
           "type": "string",
           "x-go-name": "Title"
@@ -21516,11 +21512,6 @@
         "state": {
           "$ref": "#/definitions/StateType"
         },
-        "time_estimate": {
-          "type": "integer",
-          "format": "int64",
-          "x-go-name": "TimeEstimate"
-        },
         "title": {
           "type": "string",
           "x-go-name": "Title"