diff --git a/models/issue.go b/models/issue.go
index 6188da5c6301..326454630e5c 100644
--- a/models/issue.go
+++ b/models/issue.go
@@ -1179,6 +1179,7 @@ func (m *Milestone) AfterSet(colName string, _ xorm.Cell) {
 		if m.Deadline.Year() == 9999 {
 			return
 		}
+		m.Deadline = regulateTimeZone(m.Deadline)
 
 		m.DeadlineString = m.Deadline.Format("2006-01-02")
 		if time.Now().After(m.Deadline) {
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index 57852a5ad398..635dee930e0d 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -1079,7 +1079,7 @@ func NewMilestonePost(ctx *middleware.Context, form auth.CreateMilestoneForm) {
 	if len(form.Deadline) == 0 {
 		form.Deadline = "9999-12-31"
 	}
-	deadline, err := time.Parse("2006-01-02", form.Deadline)
+	deadline, err := time.ParseInLocation("2006-01-02", form.Deadline, time.Local)
 	if err != nil {
 		ctx.Data["Err_Deadline"] = true
 		ctx.RenderWithErr(ctx.Tr("repo.milestones.invalid_due_date_format"), MILESTONE_NEW, &form)
@@ -1139,7 +1139,7 @@ func EditMilestonePost(ctx *middleware.Context, form auth.CreateMilestoneForm) {
 	if len(form.Deadline) == 0 {
 		form.Deadline = "9999-12-31"
 	}
-	deadline, err := time.Parse("2006-01-02", form.Deadline)
+	deadline, err := time.ParseInLocation("2006-01-02", form.Deadline, time.Local)
 	if err != nil {
 		ctx.Data["Err_Deadline"] = true
 		ctx.RenderWithErr(ctx.Tr("repo.milestones.invalid_due_date_format"), MILESTONE_NEW, &form)