diff --git a/workflow/engine/templates/admin/emails.js b/workflow/engine/templates/admin/emails.js
index 57e83abae..f7ed58862 100644
--- a/workflow/engine/templates/admin/emails.js
+++ b/workflow/engine/templates/admin/emails.js
@@ -101,7 +101,7 @@ Ext.onReady(function(){
     disabled : true,    
     listeners: {
       select: function(combo, value) {
-        if (Ext.getCmp('EmailEngine').getValue()== 'Mail (PHP)') {
+        if (Ext.getCmp('EmailEngine').getValue()== 'MAIL') { alert
 	  Ext.getCmp('Server').setVisible(false);
 	  Ext.getCmp('Server').getEl().up('.x-form-item').setDisplayed(false); // hide label   
 	  Ext.getCmp('Port').setVisible(false);
@@ -317,7 +317,7 @@ Ext.onReady(function(){
       params: { CFG_UID: 'Emails' },
       success: function(r,o) {          
         var res = Ext.decode(r.responseText);
-        
+        if (! res.data) return;
 	if (res.success) { 
           Ext.getCmp('EnableEmailNotifications').setValue(res.data.MESS_ENABLED);
           Ext.getCmp('EmailEngine').setValue(res.data.MESS_ENGINE);
diff --git a/workflow/engine/templates/admin/uxUsersList.js b/workflow/engine/templates/admin/uxUsersList.js
index d8859352d..02e9022cd 100755
--- a/workflow/engine/templates/admin/uxUsersList.js
+++ b/workflow/engine/templates/admin/uxUsersList.js
@@ -285,7 +285,32 @@ Ext.onReady(function(){
           store: new Ext.data.ArrayStore({
             fields: ['id', 'name'],
             data : uxTypes 
-          })
+          }),
+          listeners: {
+            select: function(a, b) {               
+              var nameGroup = groupsGrid.getSelectionModel().selection['record'].data['CON_VALUE'];
+              var uidGroup = groupsGrid.getSelectionModel().selection['record'].data['GRP_UID'];             
+              
+              Ext.Ajax.request({
+                url: '../users/users_Ajax?function=usersGroupAllFieldsExtJS',
+                params: { GRP_UID: uidGroup }, 
+                success: function(result, request) {          
+                  var res = Ext.decode(result.responseText);               
+              
+                      console.log(res.data);
+                 
+                }
+              });
+              /*var row = usersGrid.getSelectionModel().getSelected();
+              role = row.get('USR_ROLE');
+
+              if (role == 'PROCESSMAKER_ADMIN' && (this.value == 'SIMPLIFIED' || this.value == 'SINGLE')) {
+                PMExt.warning(_('ID_WARNING'), _('ID_ADMINS_CANT_USE_UXS'));
+                this.setValue('NORMAL');
+              }*/
+            }
+          }
+
         })
       }
     ]