diff --git a/web/react/components/admin_console/license_settings.jsx b/web/react/components/admin_console/license_settings.jsx
index 539acd8691..1ea176ed0f 100644
--- a/web/react/components/admin_console/license_settings.jsx
+++ b/web/react/components/admin_console/license_settings.jsx
@@ -109,7 +109,17 @@ class LicenseSettings extends React.Component {
             );
             licenseType = (
                 <FormattedHTMLMessage
-                    id='admin.license.entrepriseType'
+                    id='admin.license.enterpriseType'
+                    values={{
+                        terms: global.window.mm_config.TermsOfServiceLink,
+                        name: global.window.mm_license.Name,
+                        company: global.window.mm_license.Company,
+                        users: global.window.mm_license.Users,
+                        issued: Utils.displayDate(parseInt(global.window.mm_license.IssuedAt, 10)) + ' ' + Utils.displayTime(parseInt(global.window.mm_license.IssuedAt, 10), true),
+                        start: Utils.displayDate(parseInt(global.window.mm_license.StartsAt, 10)),
+                        expires: Utils.displayDate(parseInt(global.window.mm_license.ExpiresAt, 10)),
+                        ldap: global.window.mm_license.LDAP
+                    }}
                     defaultMessage='<div><p>This compiled release of Mattermost platform is provided under a <a href="http://mattermost.com" target="_blank">commercial license</a>
                     from Mattermost, Inc. based on your subscription level and is subject to the <a href="{terms}" target="_blank">Terms of Service.</a></p>
                     <p>Your subscription details are as follows:</p>
@@ -259,4 +269,4 @@ LicenseSettings.propTypes = {
     intl: intlShape.isRequired
 };
 
-export default injectIntl(LicenseSettings);
\ No newline at end of file
+export default injectIntl(LicenseSettings);
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index a160aa58f8..dffda84f3d 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -255,7 +255,7 @@
   "admin.license.removing": "Removing License...",
   "admin.license.uploading": "Uploading License...",
   "admin.license.enterpriseEdition": "Mattermost Enterprise Edition. Designed for enterprise-scale communication.",
-  "admin.license.entrepriseType": "<div><p>This compiled release of Mattermost platform is provided under a <a href=\"http://mattermost.com\" target=\"_blank\">commercial license</a>\n                    from Mattermost, Inc. based on your subscription level and is subject to the <a href=\"{terms}\" target=\"_blank\">Terms of Service.</a></p>\n                    <p>Your subscription details are as follows:</p>\n                    Name: {name}<br />\n                    Company or organization name: {company}<br/>\n                    Number of users: {users}<br/>\n                    License issued: {issued}<br/>\n                    Start date of license: {start}<br/>\n                    Expiry date of license: {expires}<br/>\n                    LDAP: {ldap}<br/></div>",
+  "admin.license.enterpriseType": "<div><p>This compiled release of Mattermost platform is provided under a <a href=\"http://mattermost.com\" target=\"_blank\">commercial license</a> from Mattermost, Inc. based on your subscription level and is subject to the <a href=\"{terms}\" target=\"_blank\">Terms of Service.</a></p><p>Your subscription details are as follows:</p>Name: {name}<br />Company or organization name: {company}<br/>Number of users: {users}<br/>License issued: {issued}<br/>Start date of license: {start}<br/>Expiry date of license: {expires}<br/>LDAP: {ldap}<br/></div>",
   "admin.license.keyRemove": "Remove Enterprise License and Downgrade Server",
   "admin.licence.keyMigration": "If you’re migrating servers you may need to remove your license key from this server in order to install it on a new server. To start,\n                            <a href=\"http://mattermost.com\" target=\"_blank\">disable all Enterprise Edition features on this server</a>.\n                            This will enable the ability to remove the license key and downgrade this server from Enterprise Edition to Team Edition.",
   "admin.license.teamEdition": "Mattermost Team Edition. Designed for teams from 5 to 50 users.",
diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json
index 0a780c4424..b6152474c1 100644
--- a/web/static/i18n/es.json
+++ b/web/static/i18n/es.json
@@ -211,7 +211,7 @@
   "admin.licence.keyMigration": "Si estás migrando servidores es posible que necesites remover tu licencia de este servidor para poder instalarlo en un servidor nuevo. Para empezar,\n                            <a href=\"http://mattermost.com\" target=\"_blank\">deshabilita todas las características de la Edición Enterprise de este servidor</a>.\n                            Esta operación habilitará la opción para remover la licencia y degradar este servidor de la Edición Enterprise a la Edición Team.",
   "admin.license.edition": "Edición: ",
   "admin.license.enterpriseEdition": "Mattermost Edición Enterprise. Diseñada para comunicación de escala empresarial.",
-  "admin.license.entrepriseType": "<div><p>Esta versión compilada de la plataforma de Mattermost es proporcionada bajo una <a href=\"http://mattermost.com\" target=\"_blank\">licencia comercial</a>\n                    de Mattermost, Inc. basado en tu nivel de subscripción y sujeto a los <a href=\"{terms}\" target=\"_blank\">Términos del Servicio.</a></p>\n                    <p>Los detalles de tu subscripción son los siguientes:</p>\n                    Nombre: {name}<br />\n                    Nombre de compañia u organización: {company}<br/>\n                    Cantidad de usuarios: {users}<br/>\n                    Licencia emitida por: {issued}<br/>\n                    Inicio de la licencia: {start}<br/>\n                    Fecha de expiración: {expires}<br/>\n                    LDAP: {ldap}<br/></div>",
+  "admin.license.enterpriseType": "<div><p>Esta versión compilada de la plataforma de Mattermost es proporcionada bajo una <a href=\"http://mattermost.com\" target=\"_blank\">licencia comercial</a> de Mattermost, Inc. basado en tu nivel de subscripción y sujeto a los <a href=\"{terms}\" target=\"_blank\">Términos del Servicio.</a></p><p>Los detalles de tu subscripción son los siguientes:</p>Nombre: {name}<br />Nombre de compañia u organización: {company}<br/>Cantidad de usuarios: {users}<br/>Licencia emitida por: {issued}<br/>Inicio de la licencia: {start}<br/>Fecha de expiración: {expires}<br/>LDAP: {ldap}<br/></div>",
   "admin.license.key": "Llave de la Licencia: ",
   "admin.license.keyRemove": "Remover la Licencia Enterprise y Degradar el Servidor",
   "admin.license.removing": "Removiendo Licencia...",