diff --git a/gulliver/js/maborak/core/module.panel.js b/gulliver/js/maborak/core/module.panel.js
index fb01b4a17..5f651e9b0 100755
--- a/gulliver/js/maborak/core/module.panel.js
+++ b/gulliver/js/maborak/core/module.panel.js
@@ -690,7 +690,7 @@ leimnud.Package.Public({
 				this.parent.dom.setStyle(this.elements.resize,{background:"transparent"});
 			}
 		};
-		this.makeTab=function(dynamic)
+		this.makeTab=function(dynamic, styleTabs)
 		{
 			if(this.loading===true){return false;}
 			var thm = this.tab.display==="vertical"?"":"H";
@@ -775,6 +775,11 @@ leimnud.Package.Public({
 				}
 				this.parent.dom.setStyle(tls,this.setStyle.tabOption || {});
 			}
+			if (typeof(this.flag) != "undefined") {
+				delete this.flag;
+				return true;
+			}
+
 			this.parent.dom.setStyle(tb,this.setStyle.tabOptionSelected || {});
 			if(!this.tab.options[this.tabSelected].noClear)
 			{
diff --git a/workflow/engine/js/processmap/core/processes_Map.js b/workflow/engine/js/processmap/core/processes_Map.js
index 2b5ee9ee8..ea96904cd 100755
--- a/workflow/engine/js/processmap/core/processes_Map.js
+++ b/workflow/engine/js/processmap/core/processes_Map.js
@@ -91,41 +91,56 @@ var saveDataTaskTemporal = function(iForm)
       case 7:
       case '7':
         if ( getField('SEND_EMAIL') != null && (typeof (getField('SEND_EMAIL')) != 'undefined' ) ) {
+          oTaskData.SEND_EMAIL                = getField('SEND_EMAIL').checked ? 'TRUE' : 'FALSE';
+          oTaskData.TAS_DEF_MESSAGE_TYPE      = getField('TAS_DEF_MESSAGE_TYPE').value;
+          oTaskData.TAS_DEF_MESSAGE           = getField('TAS_DEF_MESSAGE').value.replace(re, "@amp@");
+          oTaskData.TAS_DEF_SUBJECT_MESSAGE   = getField('TAS_DEF_SUBJECT_MESSAGE').value;
+          oTaskData.TAS_DEF_MESSAGE_TEMPLATE  = getField('TAS_DEF_MESSAGE_TEMPLATE').value;
+
           // validate fields TAS_DEF_SUBJECT_MESSAGE, TAS_DEF_MESSAGE
           if (getField('SEND_EMAIL').checked) {
+            var fieldEval = new input(getField('TAS_DEF_SUBJECT_MESSAGE'));
             if (getField('TAS_DEF_SUBJECT_MESSAGE').value.trim() == '') {
+              fieldEval.failed();
               new leimnud.module.app.alert().make( {
                 label : G_STRINGS.ID_SUBJECT_FIELD_REQUIRED
               });
               return false;
+            } else {
+              fieldEval.passed();
             }
             switch ( getField('TAS_DEF_MESSAGE_TYPE').value ) {
               case 'text' :
+                var vmesn = new input(getField('TAS_DEF_MESSAGE'));
                 if (getField('TAS_DEF_MESSAGE').value.trim() == '' ) {
+                  vmesn.failed();
                   new leimnud.module.app.alert().make( {
                     label : G_STRINGS.ID_MESSAGE_FIELD_REQUIRED
-                  });
+                  });                  
                   return false;
+                } else {
+                  vmesn.passed();
                 }
                 break;
               case 'template' :
+                var vmesn = new input(getField('TAS_DEF_MESSAGE_TEMPLATE'));
                 if (getField('TAS_DEF_MESSAGE_TEMPLATE').value.trim() == '' ){
+                  vmesn.failed();
                   new leimnud.module.app.alert().make( {
                     label : G_STRINGS.ID_TEMPLATE_FIELD_REQUIRED
                   });
                   return false;
+                } else {
+                  vmesn.passed();
                 }
                 break;
             }
         }
+
         if(typeof getField('SEND_EMAIL') != 'undefined' )
           oTaskData.SEND_EMAIL      = getField('SEND_EMAIL').checked ? 'TRUE' : 'FALSE';
         else
           oTaskData.SEND_EMAIL      = 'FALSE';
-        oTaskData.TAS_DEF_MESSAGE = getField('TAS_DEF_MESSAGE').value.replace(re, "@amp@");
-        oTaskData.TAS_DEF_SUBJECT_MESSAGE  = getField('TAS_DEF_SUBJECT_MESSAGE').value.replace(re, "@amp@");
-        oTaskData.TAS_DEF_MESSAGE_TYPE     = getField('TAS_DEF_MESSAGE_TYPE').value;
-        oTaskData.TAS_DEF_MESSAGE_TEMPLATE = getField('TAS_DEF_MESSAGE_TEMPLATE').value;
       }
       break;
     }
diff --git a/workflow/engine/js/processmap/core/processmap.js b/workflow/engine/js/processmap/core/processmap.js
index 29424d147..b9b4274fd 100755
--- a/workflow/engine/js/processmap/core/processmap.js
+++ b/workflow/engine/js/processmap/core/processmap.js
@@ -1571,7 +1571,19 @@ var processmap=function(){
           {simage:"/images/properties.png",text:G_STRINGS.ID_PROCESSMAP_PROPERTIES,launch:this.parent.closure({instance:this,method:function(index){
             var panel;
             var iForm=function(panel,index,ifo){
-              saveDataTaskTemporal(ifo);
+              //saveDataTaskTemporal(ifo);
+              if(typeof(panel.flag) == 'undefined') {
+                if ( !saveDataTaskTemporal(ifo)) {
+                  var tabPass = panel.tabSelected;
+                  panel.tabSelected = panel.tabLastSelected;
+                  panel.tabLastSelected = tabPass;
+                  panel.flag = true;
+                  panel.makeTab();
+                  return false;
+                }                
+              }
+              delete panel.flag;
+
               panel.command(panel.loader.show);
               var r = new this.parent.module.rpc.xmlhttp({
                 url:this.options.dataServer,
diff --git a/workflow/engine/xmlform/tasks/tasks_Notifications.xml b/workflow/engine/xmlform/tasks/tasks_Notifications.xml
index 2c0c07f89..3b76a9434 100755
--- a/workflow/engine/xmlform/tasks/tasks_Notifications.xml
+++ b/workflow/engine/xmlform/tasks/tasks_Notifications.xml
@@ -33,18 +33,6 @@
 
   <JS type="javascript"><![CDATA[
   
-  /* Recovery data */
-  if (aTaskFlag[6])
-  {
-    getField('SEND_EMAIL').checked    = (oTaskData.SEND_EMAIL == 'TRUE' ? true : false);
-    getField('TAS_DEF_MESSAGE').value = oTaskData.TAS_DEF_MESSAGE;
-  }
-  else
-  {
-    saveDataTaskTemporal(7);
-    aTaskFlag[6] = true;
-  }
-
   if (@@TAS_SEND_LAST_EMAIL == 'TRUE')
   {
     getField('SEND_EMAIL').checked = true;
@@ -66,31 +54,64 @@
     hideRowById('TAS_DEF_MESSAGE_TEMPLATE');
   }
 
-  leimnud.event.add(getField('SEND_EMAIL'), 'click', function() {
-    var oAux = document.getElementById('form[TAS_DEF_MESSAGE]');
-    if (!document.getElementById('form[SEND_EMAIL]').checked)
-    {
-      hideRowById('TAS_DEF_SUBJECT_MESSAGE');
-      hideRowById('TAS_DEF_MESSAGE');
-      hideRowById('TAS_DEF_MESSAGE_TEMPLATE');
-      hideRowById('TAS_DEF_MESSAGE_TYPE');
-    }
-    else
-    {
-      showRowById('TAS_DEF_SUBJECT_MESSAGE');
-      if (getField('TAS_DEF_MESSAGE_TYPE').value == 'template'){
-        hideRowById('TAS_DEF_MESSAGE');
-        showRowById('TAS_DEF_MESSAGE_TEMPLATE');
+  /* Recovery data */
+  if (aTaskFlag[6])
+  {
+    getField('SEND_EMAIL').checked    = (oTaskData.SEND_EMAIL == 'TRUE' ? true : false);
+    getField('TAS_DEF_MESSAGE').value = oTaskData.TAS_DEF_MESSAGE;
+    getField('TAS_DEF_SUBJECT_MESSAGE').value = oTaskData.TAS_DEF_SUBJECT_MESSAGE;
+    getField('TAS_DEF_MESSAGE_TYPE').value = oTaskData.TAS_DEF_MESSAGE_TYPE;
+    getField('TAS_DEF_MESSAGE_TEMPLATE').value = oTaskData.TAS_DEF_MESSAGE_TEMPLATE;
+    clickSendEmail();
+
+    if (getField('SEND_EMAIL').checked == true) {
+      var fieldEval = new input(getField('TAS_DEF_SUBJECT_MESSAGE'));
+      if (getField('TAS_DEF_SUBJECT_MESSAGE').value.trim() == '') {
+        fieldEval.failed();
+        new leimnud.module.app.alert().make( {
+          label : G_STRINGS.ID_SUBJECT_FIELD_REQUIRED
+        });      
       } else {
-        showRowById('TAS_DEF_MESSAGE');
-        hideRowById('TAS_DEF_MESSAGE_TEMPLATE');
+        fieldEval.passed();
+      }
+      switch ( getField('TAS_DEF_MESSAGE_TYPE').value ) {
+        case 'text' :
+          var vmesn = new input(getField('TAS_DEF_MESSAGE'));
+          if (getField('TAS_DEF_MESSAGE').value.trim() == '' ) {
+            new leimnud.module.app.alert().make( {
+              label : G_STRINGS.ID_MESSAGE_FIELD_REQUIRED
+            });
+            vmesn.failed();
+          } else {
+            vmesn.passed();
+          }
+          break;
+        case 'template' :
+          var vmesn = new input(getField('TAS_DEF_MESSAGE_TEMPLATE'));
+          if (getField('TAS_DEF_MESSAGE_TEMPLATE').value.trim() == '' ){
+            new leimnud.module.app.alert().make( {
+              label : G_STRINGS.ID_TEMPLATE_FIELD_REQUIRED
+            });
+            vmesn.failed();
+          } else {
+            vmesn.passed();
+          }
+          break;
       }
-      showRowById('TAS_DEF_MESSAGE_TYPE');
     }
+  }
+  else
+  {
+    saveDataTaskTemporal(7);
+    aTaskFlag[6] = true;
+  }
+
+  leimnud.event.add(getField('SEND_EMAIL'), 'click', function() {
+    clickSendEmail();
   });
   
   leimnud.event.add(getField('TAS_DEF_MESSAGE_TYPE'), 'change', function() {
-    if (this.value == 'text') {
+    if (getField('TAS_DEF_MESSAGE_TYPE').value == 'text') {
       showRowById('TAS_DEF_MESSAGE');
       hideRowById('TAS_DEF_MESSAGE_TEMPLATE');
     } else {
@@ -99,6 +120,42 @@
     }
   });
 
+  leimnud.event.add(getField('TAS_DEF_SUBJECT_MESSAGE'), 'change', function() {
+    var fieldEval = new input(getField('TAS_DEF_SUBJECT_MESSAGE'));
+    if (getField('TAS_DEF_SUBJECT_MESSAGE').value.trim() == '') {
+      fieldEval.failed();
+      new leimnud.module.app.alert().make( {
+        label : G_STRINGS.ID_SUBJECT_FIELD_REQUIRED
+      });
+    } else {
+      fieldEval.passed();
+    }
+  });
+
+  leimnud.event.add(getField('TAS_DEF_MESSAGE'), 'change', function() {
+    var fieldEval = new input(getField('TAS_DEF_MESSAGE'));
+    if (getField('TAS_DEF_MESSAGE').value.trim() == '') {
+      fieldEval.failed();
+      new leimnud.module.app.alert().make( {
+        label : G_STRINGS.ID_MESSAGE_FIELD_REQUIRED
+      });
+    } else {
+      fieldEval.passed();
+    }
+  });
+
+  leimnud.event.add(getField('TAS_DEF_MESSAGE_TEMPLATE'), 'change', function() {
+    var fieldEval = new input(getField('TAS_DEF_MESSAGE_TEMPLATE'));
+    if (getField('TAS_DEF_MESSAGE_TEMPLATE').value.trim() == '') {
+      fieldEval.failed();
+      new leimnud.module.app.alert().make( {
+        label : G_STRINGS.ID_TEMPLATE_FIELD_REQUIRED
+      });
+    } else {
+      fieldEval.passed();
+    }
+  });
+
   var _oVarsPanel_;
   var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol) {
     if( sProcess == '') {
@@ -154,6 +211,29 @@
   	_oVarsPanel_.remove();
   };
 
+  var clickSendEmail = function() {
+    var oAux = document.getElementById('form[TAS_DEF_MESSAGE]');
+    if (!document.getElementById('form[SEND_EMAIL]').checked)
+    {
+      hideRowById('TAS_DEF_SUBJECT_MESSAGE');
+      hideRowById('TAS_DEF_MESSAGE');
+      hideRowById('TAS_DEF_MESSAGE_TEMPLATE');
+      hideRowById('TAS_DEF_MESSAGE_TYPE');
+    }
+    else
+    {
+      showRowById('TAS_DEF_SUBJECT_MESSAGE');
+      if (getField('TAS_DEF_MESSAGE_TYPE').value == 'template'){
+        hideRowById('TAS_DEF_MESSAGE');
+        showRowById('TAS_DEF_MESSAGE_TEMPLATE');
+      } else {
+        showRowById('TAS_DEF_MESSAGE');
+        hideRowById('TAS_DEF_MESSAGE_TEMPLATE');
+      }
+      showRowById('TAS_DEF_MESSAGE_TYPE');
+    }
+  };
+
   ]]></JS>
 
 </dynaForm>  
\ No newline at end of file