diff --git a/workflow/engine/controllers/main.php b/workflow/engine/controllers/main.php
index 39aca7ec2..5b2fe3f6b 100644
--- a/workflow/engine/controllers/main.php
+++ b/workflow/engine/controllers/main.php
@@ -321,6 +321,7 @@ class Main extends Controller
     $availableLangArray = $this->getLanguagesList();
 
     $this->includeExtJSLib('ux/virtualkeyboard');
+    $this->setJSVar('sysLang', SYS_LANG);
     $this->includeExtJS('main/sysLogin');
 
     $this->setVar('logo_company', $this->getCompanyLogo());
@@ -791,4 +792,4 @@ class Main extends Controller
       $_SESSION['DEV_FLAG'] = true;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/workflow/engine/methods/login/sysLogin.php b/workflow/engine/methods/login/sysLogin.php
index 47dcaf904..f1c06ca62 100755
--- a/workflow/engine/methods/login/sysLogin.php
+++ b/workflow/engine/methods/login/sysLogin.php
@@ -110,6 +110,7 @@ $_DBArray ['availableWorkspace'] = $availableWorkspaceArray;
 $_SESSION ['_DBArray'] = $_DBArray;
 
 $aField ['LOGIN_VERIFY_MSG'] = G::loadTranslation ( 'LOGIN_VERIFY_MSG' );
+$aField['USER_LANG'] = SYS_LANG;
 //Get Server Configuration
 G::LoadClass ( 'serverConfiguration' );
 $oServerConf = & serverConf::getSingleton ();
diff --git a/workflow/engine/templates/admin/system.js b/workflow/engine/templates/admin/system.js
index 267e24321..97aaac30c 100644
--- a/workflow/engine/templates/admin/system.js
+++ b/workflow/engine/templates/admin/system.js
@@ -82,7 +82,7 @@ Ext.onReady(function(){
       }
     }
   });
-  
+
   cmbTimeZone.setValue(sysConf.time_zone);
 
   saveButton = new Ext.Action({
@@ -90,12 +90,10 @@ Ext.onReady(function(){
     disabled : true,
     handler : saveSettings
   });
-  
-  xfields = new Ext.form.FieldSet({
+
+  xfieldsUp = new Ext.form.FieldSet({
     title: _('ID_SYSTEM_SETTINGS'),
     items : [
-      cmbSkins,
-      cmbLang,
       cmbTimeZone,
       {
         xtype: 'numberfield',
@@ -109,23 +107,29 @@ Ext.onReady(function(){
             changeSettings();
           }
         }
-      }/*,
-      {
-        name: 'forgotPasswd',
-        xtype: 'checkbox',
-        checked: false, //forgotPasswd,
-        fieldLabel: _('ID_ENABLE_FOTGOT_PASSWORD'),
-        listeners:{
-          check:function(){
-            changeSettings();
-          }
-        }
-      }*/
-    ],
-    buttons : [saveButton]
+      }
+    ]
+  });
+
+  xfieldsBelow = new Ext.form.FieldSet({
+    title: '',
+    items : [
+      cmbSkins,
+      cmbLang,
+      {
+        xtype: 'panel',
+        anchor: '100%',
+        bodyStyle:'padding:5px',
+        frame: true,
+        height: 'auto',
+        html:'The language that is set by default applies directly when the domain is entered '+
+            ' (eg.- http://127.0.0.1:8081), the system reads the configuration and redirects '+
+            '  the link to the selected language (eg.- http://127.0.0.1:8081/sys/en/classic/login/login),'+
+            ' it should be emphasized that this configuration is for all environments.'
+      }
+    ]
   });
 
-  
   var frm = new Ext.FormPanel({
     title: '&nbsp',
     id:'frm',
@@ -133,7 +137,7 @@ Ext.onReady(function(){
     width:460,
     labelAlign:'right',
     autoScroll: true,
-    bodyStyle:'padding:2px',
+    bodyStyle:'padding:5px',
     waitMsgTarget : true,
     frame: true,
     
@@ -142,7 +146,8 @@ Ext.onReady(function(){
       msgTarget: 'side',
       align:'center'
     },
-    items:[ xfields ]
+    items:[ xfieldsUp, xfieldsBelow ],
+    buttons : [saveButton]
    
   });
   //render to process-panel
diff --git a/workflow/engine/templates/main/sysLogin.js b/workflow/engine/templates/main/sysLogin.js
index e1510755f..17373a7ba 100644
--- a/workflow/engine/templates/main/sysLogin.js
+++ b/workflow/engine/templates/main/sysLogin.js
@@ -203,10 +203,10 @@ Login.initComponents = function()
     }),
     listeners     : {
       afterrender : function() {
-        if (defaultLang == '') return;
+        if (sysLang == '') return;
 
         var store = languagesCmb.getStore();
-        var i = store.findExact('id', defaultLang, 0);
+        var i = store.findExact('id', sysLang, 0);
         if (i > -1) {
           Ext.getCmp('language').setValue(store.getAt(i).data.id);
           Ext.getCmp('language').setRawValue(store.getAt(i).data.name);
diff --git a/workflow/engine/templates/setup/loginSettings.js b/workflow/engine/templates/setup/loginSettings.js
index 403c10d91..2ceb0ce2d 100755
--- a/workflow/engine/templates/setup/loginSettings.js
+++ b/workflow/engine/templates/setup/loginSettings.js
@@ -60,6 +60,15 @@ Ext.onReady(function(){
             changeSettings();
           }
         }
+      },
+      {
+        xtype: 'panel',
+        anchor: '100%',
+        bodyStyle:'padding:5px',
+        frame: true,
+        height: 'auto',
+        html:'The default language that is configured in this place is for the "dropdown" of the '+
+            'languages that are displaying on the login screen, this configuration is set for each workspace.'
       }
     ],
     buttons : [saveButton]