diff --git a/routers/user/setting.go b/routers/user/setting.go index de5a1baca4..16ba2bb050 100644 --- a/routers/user/setting.go +++ b/routers/user/setting.go @@ -105,6 +105,11 @@ func SettingsPost(ctx *context.Context, form auth.UpdateProfileForm) { ctx.User.Website = form.Website ctx.User.Location = form.Location if err := models.UpdateUser(ctx.User); err != nil { + if _, ok := err.(models.ErrEmailAlreadyUsed); ok { + ctx.Flash.Error(ctx.Tr("form.email_been_used")) + ctx.Redirect(setting.AppSubURL + "/user/settings") + return + } ctx.Handle(500, "UpdateUser", err) return }