4 files changed, 10 insertions, 0 deletions
diff --git a/routers/user/auth.go b/routers/user/auth.go
index ed8aac0de9..cb7d5961bd 100644
--- a/routers/user/auth.go
+++ b/routers/user/auth.go
@@ -872,6 +872,9 @@ func ForgotPasswd(ctx *context.Context) {
 		return
 	}
 
+	email := ctx.Query("email")
+	ctx.Data["Email"] = email
+
 	ctx.Data["IsResetRequest"] = true
 	ctx.HTML(200, tplForgotPassword)
 }
diff --git a/routers/user/setting.go b/routers/user/setting.go
index 66ee680fb5..622f45f2c6 100644
--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -193,6 +193,7 @@ func SettingsDeleteAvatar(ctx *context.Context) {
 func SettingsPassword(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("settings")
 	ctx.Data["PageIsSettingsPassword"] = true
+	ctx.Data["Email"] = ctx.User.Email
 	ctx.HTML(200, tplSettingsPassword)
 }
 
@@ -200,6 +201,7 @@ func SettingsPassword(ctx *context.Context) {
 func SettingsPasswordPost(ctx *context.Context, form auth.ChangePasswordForm) {
 	ctx.Data["Title"] = ctx.Tr("settings")
 	ctx.Data["PageIsSettingsPassword"] = true
+	ctx.Data["PageIsSettingsDelete"] = true
 
 	if ctx.HasError() {
 		ctx.HTML(200, tplSettingsPassword)
@@ -684,6 +686,7 @@ func SettingsDeleteAccountLink(ctx *context.Context) {
 func SettingsDelete(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("settings")
 	ctx.Data["PageIsSettingsDelete"] = true
+	ctx.Data["Email"] = ctx.User.Email
 
 	if ctx.Req.Method == "POST" {
 		if _, err := models.UserSignIn(ctx.User.Name, ctx.Query("password")); err != nil {
diff --git a/templates/user/settings/delete.tmpl b/templates/user/settings/delete.tmpl
index b95eb2105f..67f5782d6e 100644
--- a/templates/user/settings/delete.tmpl
+++ b/templates/user/settings/delete.tmpl
@@ -22,6 +22,9 @@
 						<div class="ui red button delete-button" data-type="form" data-form="#delete-form">
 							{{.i18n.Tr "settings.confirm_delete_account"}}
 						</div>
+						<div>
+							<a href="{{AppSubUrl}}/user/forget_password?email={{.Email}}">{{.i18n.Tr "auth.forget_password"}}</a>
+						</div>
 					</form>
 				</div>
 			</div>
diff --git a/templates/user/settings/password.tmpl b/templates/user/settings/password.tmpl
index b59d1ff56f..f4883d7bf0 100644
--- a/templates/user/settings/password.tmpl
+++ b/templates/user/settings/password.tmpl
@@ -29,6 +29,7 @@
 
 						<div class="field">
 							<button class="ui green button">{{$.i18n.Tr "settings.change_password"}}</button>
+							<a href="{{AppSubUrl}}/user/forget_password?email={{.Email}}">{{.i18n.Tr "auth.forget_password"}}</a>
 						</div>
 					</form>
 					{{else}}