diff --git a/config/client.go b/config/client.go
index a0f47f86a4..a6fed84bd0 100644
--- a/config/client.go
+++ b/config/client.go
@@ -20,6 +20,7 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L
 	props["RestrictDirectMessage"] = *c.TeamSettings.RestrictDirectMessage
 	props["EnableXToLeaveChannelsFromLHS"] = strconv.FormatBool(*c.TeamSettings.EnableXToLeaveChannelsFromLHS)
 	props["TeammateNameDisplay"] = *c.TeamSettings.TeammateNameDisplay
+	props["LockTeammateNameDisplay"] = strconv.FormatBool(*c.TeamSettings.LockTeammateNameDisplay)
 	props["ExperimentalPrimaryTeam"] = *c.TeamSettings.ExperimentalPrimaryTeam
 	props["ExperimentalViewArchivedChannels"] = strconv.FormatBool(*c.TeamSettings.ExperimentalViewArchivedChannels)
 
diff --git a/model/config.go b/model/config.go
index 482bbdf75d..a883cd33bb 100644
--- a/model/config.go
+++ b/model/config.go
@@ -1521,6 +1521,7 @@ type TeamSettings struct {
 	ExperimentalEnableAutomaticReplies                        *bool
 	ExperimentalHideTownSquareinLHS                           *bool
 	ExperimentalTownSquareIsReadOnly                          *bool
+	LockTeammateNameDisplay                                   *bool
 	ExperimentalPrimaryTeam                                   *string
 	ExperimentalDefaultChannels                               []string
 }
@@ -1667,6 +1668,10 @@ func (s *TeamSettings) SetDefaults() {
 	if s.ExperimentalViewArchivedChannels == nil {
 		s.ExperimentalViewArchivedChannels = NewBool(false)
 	}
+
+	if s.LockTeammateNameDisplay == nil {
+		s.LockTeammateNameDisplay = NewBool(false)
+	}
 }
 
 type ClientRequirements struct {