diff --git a/workflow/engine/methods/login/login.php b/workflow/engine/methods/login/login.php
index 329f1d838..ac8b24761 100755
--- a/workflow/engine/methods/login/login.php
+++ b/workflow/engine/methods/login/login.php
@@ -216,7 +216,12 @@ $translationsTable = $Translations->getTranslationEnvironments();
 
 $availableLangArray = array ();
 $availableLangArray [] = array ('LANG_ID' => 'char', 'LANG_NAME' => 'char' );
-$availableLangArray []  = array ('LANG_ID' => 'default', 'LANG_NAME' => G::LoadTranslation("ID_DEFAULT_LANGUAGE") );
+/*----------------------------------********---------------------------------*/
+$licensedFeatures = & PMLicensedFeatures::getSingleton();
+if ($licensedFeatures->verifyfeature('w2LL3o4NFNiaDRXcFFCYVpJS3Jsall5dmh0ZWtBTkdKR3ROS0VzWGdoLzNQYz0=')) {
+    $availableLangArray []  = array ('LANG_ID' => 'default', 'LANG_NAME' => G::LoadTranslation("ID_DEFAULT_LANGUAGE") );
+}
+/*----------------------------------********---------------------------------*/
 foreach ($translationsTable as $locale) {
     $row['LANG_ID'] = $locale['LOCALE'];
 
@@ -240,7 +245,12 @@ $oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS', '');
 
 if (isset($oConf->aConfig["login_defaultLanguage"]) && $oConf->aConfig["login_defaultLanguage"] != "") {
     $aFields["USER_LANG"] = $oConf->aConfig["login_defaultLanguage"];
-    $aFields["USER_LANG"] = "default";
+    /*----------------------------------********---------------------------------*/
+    $licensedFeatures = & PMLicensedFeatures::getSingleton();
+    if ($licensedFeatures->verifyfeature('w2LL3o4NFNiaDRXcFFCYVpJS3Jsall5dmh0ZWtBTkdKR3ROS0VzWGdoLzNQYz0=')) {
+        $aFields["USER_LANG"] = "default";
+    }
+    /*----------------------------------********---------------------------------*/
 } else {
     $myUrl = explode("/", $_SERVER["REQUEST_URI"]);
 
diff --git a/workflow/engine/methods/login/sysLogin.php b/workflow/engine/methods/login/sysLogin.php
index d8ee757fa..116d3c465 100755
--- a/workflow/engine/methods/login/sysLogin.php
+++ b/workflow/engine/methods/login/sysLogin.php
@@ -121,7 +121,6 @@ $translationsTable = $Translations->getTranslationEnvironments();
 
 $availableLangArray = array ();
 $availableLangArray [] = array ('LANG_ID' => 'char', 'LANG_NAME' => 'char');
-$availableLangArray []  = array ('LANG_ID' => 'default', 'LANG_NAME' => G::LoadTranslation("ID_DEFAULT_LANGUAGE") );
 
 foreach ($translationsTable as $locale) {
     $aFields['LANG_ID'] = $locale['LOCALE'];
@@ -150,7 +149,6 @@ $_SESSION ['_DBArray'] = $_DBArray;
 
 $aField ['LOGIN_VERIFY_MSG'] = G::loadTranslation ('LOGIN_VERIFY_MSG');
 $aField['USER_LANG'] = SYS_LANG;
-$aField['USER_LANG'] = "default";
 
 $G_PUBLISH = new Publisher ();
 if (!defined('WS_IN_LOGIN')) {
diff --git a/workflow/engine/methods/users/usersEdit.php b/workflow/engine/methods/users/usersEdit.php
index b928a824b..4b321099a 100644
--- a/workflow/engine/methods/users/usersEdit.php
+++ b/workflow/engine/methods/users/usersEdit.php
@@ -13,6 +13,13 @@ $uploadMaxSize = (int) $UPLOAD_MAX_SIZE * $mul;
 if ($postMaxSize < $uploadMaxSize) {
     $uploadMaxSize = $postMaxSize;
 }
+$languageManagement = 0;
+/*----------------------------------********---------------------------------*/
+$licensedFeatures = & PMLicensedFeatures::getSingleton();
+if ($licensedFeatures->verifyfeature('w2LL3o4NFNiaDRXcFFCYVpJS3Jsall5dmh0ZWtBTkdKR3ROS0VzWGdoLzNQYz0=')) {
+    $languageManagement = 1;
+}
+/*----------------------------------********---------------------------------*/
 
 $arraySystemConfiguration = System::getSystemConfiguration('', '', SYS_SYS);
 
@@ -24,6 +31,7 @@ $oHeadPublisher->assign( 'MAX_FILES_SIZE', ' (' . $UPLOAD_MAX_SIZE . ') ' );
 $oHeadPublisher->assign('SYSTEM_TIME_ZONE', $arraySystemConfiguration['time_zone']);
 $oHeadPublisher->assign('TIME_ZONE_DATA', array_map(function ($value) { return [$value, $value]; }, DateTimeZone::listIdentifiers()));
 $oHeadPublisher->assign('__SYSTEM_UTC_TIME_ZONE__', (isset($_SESSION['__SYSTEM_UTC_TIME_ZONE__']) && $_SESSION['__SYSTEM_UTC_TIME_ZONE__'])? 1 : 0);
+$oHeadPublisher->assign('LANGUAGE_MANAGEMENT', $languageManagement);
 
 G::RenderPage( 'publish', 'extJs' );
 
diff --git a/workflow/engine/methods/users/usersInit.php b/workflow/engine/methods/users/usersInit.php
index fe4e70d4a..3a53ed036 100644
--- a/workflow/engine/methods/users/usersInit.php
+++ b/workflow/engine/methods/users/usersInit.php
@@ -26,6 +26,13 @@ $uploadMaxSize = (int) $UPLOAD_MAX_SIZE * $mul;
 if ($postMaxSize < $uploadMaxSize) {
     $uploadMaxSize = $postMaxSize;
 }
+$languageManagement = 0;
+/*----------------------------------********---------------------------------*/
+$licensedFeatures = & PMLicensedFeatures::getSingleton();
+if ($licensedFeatures->verifyfeature('w2LL3o4NFNiaDRXcFFCYVpJS3Jsall5dmh0ZWtBTkdKR3ROS0VzWGdoLzNQYz0=')) {
+    $languageManagement = 1;
+}
+/*----------------------------------********---------------------------------*/
 
 $arraySystemConfiguration = System::getSystemConfiguration('', '', SYS_SYS);
 
@@ -41,5 +48,6 @@ $oHeadPublisher->assign( 'MODE', '' );
 $oHeadPublisher->assign('SYSTEM_TIME_ZONE', $arraySystemConfiguration['time_zone']);
 $oHeadPublisher->assign('TIME_ZONE_DATA', array_map(function ($value) { return [$value, $value]; }, DateTimeZone::listIdentifiers()));
 $oHeadPublisher->assign('__SYSTEM_UTC_TIME_ZONE__', (isset($_SESSION['__SYSTEM_UTC_TIME_ZONE__']) && $_SESSION['__SYSTEM_UTC_TIME_ZONE__'])? 1 : 0);
+$oHeadPublisher->assign('LANGUAGE_MANAGEMENT', $languageManagement);
 
 G::RenderPage( 'publish', 'extJs' );
diff --git a/workflow/engine/templates/users/users.js b/workflow/engine/templates/users/users.js
index 61609080d..fe8ead2d7 100755
--- a/workflow/engine/templates/users/users.js
+++ b/workflow/engine/templates/users/users.js
@@ -427,6 +427,7 @@ Ext.onReady(function () {
         hidden: !(__SYSTEM_UTC_TIME_ZONE__ == 1)
     });
 
+  /*----------------------------------********---------------------------------*/
   storeLanguage = new Ext.data.Store({
       proxy: new Ext.data.HttpProxy({
           url: "usersAjax",
@@ -457,8 +458,10 @@ Ext.onReady(function () {
     editable      : false,
     allowBlank    : false,
     triggerAction : 'all',
-    mode          : 'local'
+    mode          : 'local',
+    hidden        : !(LANGUAGE_MANAGEMENT == 1)
   });
+  /*----------------------------------********---------------------------------*/
 
     var informationFields = new Ext.form.FieldSet({
       title : _('ID_PERSONAL_INFORMATION'),
@@ -570,8 +573,10 @@ Ext.onReady(function () {
         comboCalendar,
         comboStatus,
         comboRole,
-        cboTimeZone,
-        comboLanguage
+        cboTimeZone
+        /*----------------------------------********---------------------------------*/
+        ,comboLanguage
+        /*----------------------------------********---------------------------------*/
       ]
   });
     /*----------------------------------********---------------------------------*/
@@ -999,7 +1004,8 @@ Ext.onReady(function () {
         id         : 'USR_DEFAULT_LANG2',
         fieldLabel : _('ID_DEFAULT_LANGUAGE'),
         xtype      : 'label',
-        width      : 260
+        width      : 260,
+        hidden     : !(LANGUAGE_MANAGEMENT == 1)
       }
     ]
   });
@@ -1397,10 +1403,12 @@ function loadData()
     });
     comboRole.store.load();
 
+    /*----------------------------------********---------------------------------*/
     comboLanguage.store.on("load", function (store) {
         comboLanguage.setValue(store.getAt(1).get("LAN_ID"));
     });
     comboLanguage.store.load();
+    /*----------------------------------********---------------------------------*/
 
     comboDefaultMainMenuOption.store.on("load", function (store) {
         comboDefaultMainMenuOption.setValue(store.getAt(0).get("id"));
@@ -1465,8 +1473,8 @@ function loadUserData()
                 Ext.getCmp("USR_STATUS2").setText(_('ID_' + data.user.USR_STATUS));
                 Ext.getCmp("USR_ROLE2").setText(data.user.USR_ROLE_NAME);
                 Ext.getCmp("USR_TIME_ZONE2").setText((data.user.USR_TIME_ZONE != "")? data.user.USR_TIME_ZONE : SYSTEM_TIME_ZONE);
-                Ext.getCmp("USR_DEFAULT_LANG2").setText(data.user.USR_DEFAULT_LANG_NAME);
                 /*----------------------------------********---------------------------------*/
+                Ext.getCmp("USR_DEFAULT_LANG2").setText(data.user.USR_DEFAULT_LANG_NAME);
                 Ext.getCmp("USR_COST_BY_HOUR2").setText(data.user.USR_COST_BY_HOUR);
                 Ext.getCmp("USR_UNIT_COST2").setText(data.user.USR_UNIT_COST);
                 /*----------------------------------********---------------------------------*/
@@ -1510,9 +1518,11 @@ function loadUserData()
 
             cboTimeZone.setValue((data.user.USR_TIME_ZONE != "")? data.user.USR_TIME_ZONE : SYSTEM_TIME_ZONE);
 
+            /*----------------------------------********---------------------------------*/
             comboLanguage.store.on("load", function (store) {
                 comboLanguage.setValue(data.user.USR_DEFAULT_LANG);
             });
+            /*----------------------------------********---------------------------------*/
 
             if (infoMode) {
                 comboDefaultMainMenuOption.store.on("load", function (store) {
@@ -1561,7 +1571,9 @@ function loadUserData()
 
             storeRole.load();
 
+            /*----------------------------------********---------------------------------*/
             storeLanguage.load();
+            /*----------------------------------********---------------------------------*/
 
             storeDefaultMainMenuOption.load();