1 files changed, 21 insertions, 1 deletions

diff --git a/webapp/components/admin_console/users_and_teams_settings.jsx b/webapp/components/admin_console/users_and_teams_settings.jsx
index b20b66541..60ee70264 100644
--- a/webapp/components/admin_console/users_and_teams_settings.jsx
+++ b/webapp/components/admin_console/users_and_teams_settings.jsx
@@ -32,6 +32,7 @@ export default class UsersAndTeamsSettings extends AdminSettings {
         config.TeamSettings.RestrictCreationToDomains = this.state.restrictCreationToDomains;
         config.TeamSettings.RestrictTeamNames = this.state.restrictTeamNames;
         config.TeamSettings.RestrictDirectMessage = this.state.restrictDirectMessage;
+        config.TeamSettings.MaxChannelsPerTeam = this.parseIntNonZero(this.state.maxChannelsPerTeam, Constants.DEFAULT_MAX_CHANNELS_PER_TEAM);
 
         return config;
     }
@@ -43,7 +44,8 @@ export default class UsersAndTeamsSettings extends AdminSettings {
             maxUsersPerTeam: config.TeamSettings.MaxUsersPerTeam,
             restrictCreationToDomains: config.TeamSettings.RestrictCreationToDomains,
             restrictTeamNames: config.TeamSettings.RestrictTeamNames,
-            restrictDirectMessage: config.TeamSettings.RestrictDirectMessage
+            restrictDirectMessage: config.TeamSettings.RestrictDirectMessage,
+            maxChannelsPerTeam: config.TeamSettings.MaxChannelsPerTeam
         };
     }
 
@@ -114,6 +116,24 @@ export default class UsersAndTeamsSettings extends AdminSettings {
                     onChange={this.handleChange}
                 />
                 <TextSetting
+                    id='maxChannelsPerTeam'
+                    label={
+                        <FormattedMessage
+                            id='admin.team.maxChannelsTitle'
+                            defaultMessage='Max Channels Per Team:'
+                        />
+                    }
+                    placeholder={Utils.localizeMessage('admin.team.maxChannelsExample', 'Ex "100"')}
+                    helpText={
+                        <FormattedMessage
+                            id='admin.team.maxChannelsDescription'
+                            defaultMessage='Maximum total number of channels per team, including both active and deleted channels.'
+                        />
+                    }
+                    value={this.state.maxChannelsPerTeam}
+                    onChange={this.handleChange}
+                />
+                <TextSetting
                     id='restrictCreationToDomains'
                     label={
                         <FormattedMessage