diff --git a/webapp/components/admin_console/email_settings.jsx b/webapp/components/admin_console/email_settings.jsx
index 6cf09f653e..d54ab39067 100644
--- a/webapp/components/admin_console/email_settings.jsx
+++ b/webapp/components/admin_console/email_settings.jsx
@@ -34,6 +34,7 @@ export default class EmailSettings extends AdminSettings {
         config.EmailSettings.ConnectionSecurity = this.state.connectionSecurity;
         config.EmailSettings.EnableEmailBatching = this.state.enableEmailBatching;
         config.ServiceSettings.EnableSecurityFixAlert = this.state.enableSecurityFixAlert;
+        config.EmailSettings.SkipServerCertificateVerification = this.state.skipServerCertificateVerification;
 
         return config;
     }
@@ -50,6 +51,7 @@ export default class EmailSettings extends AdminSettings {
             smtpPort: config.EmailSettings.SMTPPort,
             connectionSecurity: config.EmailSettings.ConnectionSecurity,
             enableEmailBatching: config.EmailSettings.EnableEmailBatching,
+            skipServerCertificateVerification: config.EmailSettings.SkipServerCertificateVerification,
             enableSecurityFixAlert: config.ServiceSettings.EnableSecurityFixAlert
         };
     }
@@ -274,6 +276,23 @@ export default class EmailSettings extends AdminSettings {
                     getConfigFromState={this.getConfigFromState}
                     disabled={!this.state.sendEmailNotifications}
                 />
+                <BooleanSetting
+                    id='skipServerCertificateVerification'
+                    label={
+                        <FormattedMessage
+                            id='admin.email.skipServerCertificateVerification.title'
+                            defaultMessage='Skip Server Certificate Verification: '
+                        />
+                    }
+                    helpText={
+                        <FormattedMessage
+                            id='admin.email.skipServerCertificateVerification.description'
+                            defaultMessage='When true, Mattermost will not verify the email server certificate.'
+                        />
+                    }
+                    value={this.state.skipServerCertificateVerification}
+                    onChange={this.handleChange}
+                />
                 <BooleanSetting
                     id='enableSecurityFixAlert'
                     label={
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index b664441682..92a97af417 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -283,6 +283,8 @@
   "admin.email.requireVerificationDescription": "Typically set to true in production. When true, Mattermost requires email verification after account creation prior to allowing login. Developers may set this field to false so skip sending verification emails for faster development.",
   "admin.email.requireVerificationTitle": "Require Email Verification: ",
   "admin.email.selfPush": "Manually enter Push Notification Service location",
+  "admin.email.skipServerCertificateVerification.description": "When true, Mattermost will not verify the email server certificate.",
+  "admin.email.skipServerCertificateVerification.title": "Skip Server Certificate Verification: ",
   "admin.email.smtpPasswordDescription": " Obtain this credential from administrator setting up your email server.",
   "admin.email.smtpPasswordExample": "E.g.: \"yourpassword\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.email.smtpPasswordTitle": "SMTP Server Password:",