From 53919bd332475786d938f5f0308159985e268e29 Mon Sep 17 00:00:00 2001
From: Julien Tant <785518+JulienTant@users.noreply.github.com>
Date: Wed, 23 Feb 2022 08:04:29 -0700
Subject: [PATCH] [MM-41671] Support Email Position+Validation (#19590)

---
 api4/config.go  | 3 +--
 model/config.go | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/api4/config.go b/api4/config.go
index a6f875f0d1..4f469cc15b 100644
--- a/api4/config.go
+++ b/api4/config.go
@@ -147,8 +147,7 @@ func updateConfig(c *Context, w http.ResponseWriter, r *http.Request) {
 
 	c.App.HandleMessageExportConfig(cfg, appCfg)
 
-	err := cfg.IsValid()
-	if err != nil {
+	if err := cfg.IsValid(); err != nil {
 		c.Err = err
 		return
 	}
diff --git a/model/config.go b/model/config.go
index 04dfa4f5a2..ad066cd181 100644
--- a/model/config.go
+++ b/model/config.go
@@ -1739,7 +1739,7 @@ type SupportSettings struct {
 	AboutLink                              *string `access:"site_customization,write_restrictable,cloud_restrictable"`
 	HelpLink                               *string `access:"site_customization,write_restrictable,cloud_restrictable"`
 	ReportAProblemLink                     *string `access:"site_customization,write_restrictable,cloud_restrictable"`
-	SupportEmail                           *string `access:"site_customization"`
+	SupportEmail                           *string `access:"site_notifications"`
 	CustomTermsOfServiceEnabled            *bool   `access:"compliance_custom_terms_of_service"`
 	CustomTermsOfServiceReAcceptancePeriod *int    `access:"compliance_custom_terms_of_service"`
 	EnableAskCommunityLink                 *bool   `access:"site_customization"`