diff --git a/model/license.go b/model/license.go
index e924a03302..eaf2439797 100644
--- a/model/license.go
+++ b/model/license.go
@@ -61,6 +61,7 @@ type Features struct {
 	CustomTermsOfService      *bool `json:"custom_terms_of_service"`
 	GuestAccountsPermissions  *bool `json:"guest_accounts_permissions"`
 	IDLoadedPushNotifications *bool `json:"id_loaded"`
+	LockTeammateNameDisplay   *bool `json:"lock_teammate_name_display"`
 
 	// after we enabled more features we'll need to control them with this
 	FutureFeatures *bool `json:"future_features"`
@@ -85,6 +86,7 @@ func (f *Features) ToMap() map[string]interface{} {
 		"custom_permissions_schemes":  *f.CustomPermissionsSchemes,
 		"guest_accounts_permissions":  *f.GuestAccountsPermissions,
 		"id_loaded":                   *f.IDLoadedPushNotifications,
+		"lock_teammate_name_display":  *f.LockTeammateNameDisplay,
 		"future":                      *f.FutureFeatures,
 	}
 }
@@ -177,6 +179,10 @@ func (f *Features) SetDefaults() {
 	if f.IDLoadedPushNotifications == nil {
 		f.IDLoadedPushNotifications = NewBool(*f.FutureFeatures)
 	}
+
+	if f.LockTeammateNameDisplay == nil {
+		f.LockTeammateNameDisplay = NewBool(*f.FutureFeatures)
+	}
 }
 
 func (l *License) IsExpired() bool {
diff --git a/utils/license.go b/utils/license.go
index ec42cf98cd..62a32b1ca7 100644
--- a/utils/license.go
+++ b/utils/license.go
@@ -157,6 +157,7 @@ func GetClientLicense(l *model.License) map[string]string {
 		props["CustomPermissionsSchemes"] = strconv.FormatBool(*l.Features.CustomPermissionsSchemes)
 		props["GuestAccountsPermissions"] = strconv.FormatBool(*l.Features.GuestAccountsPermissions)
 		props["CustomTermsOfService"] = strconv.FormatBool(*l.Features.CustomTermsOfService)
+		props["LockTeammateNameDisplay"] = strconv.FormatBool(*l.Features.LockTeammateNameDisplay)
 	}
 
 	return props