diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php
index 83a2ac8a2..d993acfbc 100644
--- a/workflow/engine/controllers/adminProxy.php
+++ b/workflow/engine/controllers/adminProxy.php
@@ -653,13 +653,15 @@ class adminProxy extends HttpProxyController
     $oConfiguration = new Configurations();      
     $oConfiguration->loadConfig($x, 'Emails','','','','');
     $fields = $oConfiguration->aConfig;
-    $this->success = (count($fields) > 0);    
-    $passwd = $fields['MESS_PASSWORD'];
-    $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
-    if (strpos( $passwdDec, 'hash:' ) !== false) {
-      list($hash, $pass) = explode(":", $passwdDec);   
-      $fields['MESS_PASSWORD'] = $pass;
-    }    
+    if (count($fields) > 0) {
+      $this->success = (count($fields) > 0);    
+      $passwd = $fields['MESS_PASSWORD'];
+      $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
+      if (strpos( $passwdDec, 'hash:' ) !== false) {
+        list($hash, $pass) = explode(":", $passwdDec);   
+        $fields['MESS_PASSWORD'] = $pass;
+      }    
+    }
     $this->data = $fields;
   }
 
diff --git a/workflow/engine/templates/admin/emails.js b/workflow/engine/templates/admin/emails.js
index f7ed58862..b6bc23879 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') { alert
+        if (Ext.getCmp('EmailEngine').getValue()== 'MAIL') { 
 	  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,8 @@ Ext.onReady(function(){
       params: { CFG_UID: 'Emails' },
       success: function(r,o) {          
         var res = Ext.decode(r.responseText);
-        if (! res.data) return;
+        if (! res.data) 
+          return;
 	if (res.success) { 
           Ext.getCmp('EnableEmailNotifications').setValue(res.data.MESS_ENABLED);
           Ext.getCmp('EmailEngine').setValue(res.data.MESS_ENGINE);