diff --git a/workflow/engine/xmlform/setup/calendarEdit.xml b/workflow/engine/xmlform/setup/calendarEdit.xml
index 8ef80a8dd..7a4a380cb 100644
--- a/workflow/engine/xmlform/setup/calendarEdit.xml
+++ b/workflow/engine/xmlform/setup/calendarEdit.xml
@@ -42,7 +42,7 @@
     <en><![CDATA[Holidays]]></en>
   </HOLIDAY_LABEL>
   <HOLIDAY type="grid" xmlgrid="setup/calendarEdit_Holidays" addrow="1" deleterow="1"/>
-  <SUBMIT type="submit" onclick="submit1(this);">
+  <SUBMIT type="button" onclick="submit1(this);">
     <en><![CDATA[Save]]></en>
   </SUBMIT>
   <SUBMIT2 type="button" onclick="submit2();   ">
@@ -69,7 +69,7 @@ function submit1 () {
   getField('CALENDAR_WORK_DAYS][6').disabled=false;
   getField('CALENDAR_STATUS').disabled=false;
   getField('CALENDAR_NAME').disabled=false;
-  return validateForm(this.form);
+  validateForm(this.form);
 }
 
 function submit2 () {
@@ -358,7 +358,8 @@ function validateForm(form){
 	}
         getField('CALENDAR_NAME').value=getField('CALENDAR_NAME').value.trim();
 	if(getField('CALENDAR_NAME').value==""){
-	msg+="- Invalid Name \n";
+   msg+=G_STRINGS.ID_REQUIRED_FIELDS + ": \n\n ";
+	 msg+="- "+ '@G::LoadTranslation(ID_NAME)' +" \n";	
 	}
 	var flag=true;
 	var rowsHoliday=Number_Rows_Grid("HOLIDAY", "CALENDAR_HOLIDAY_START");
@@ -371,14 +372,17 @@ function validateForm(form){
 		}
 	}
 	if(!flag){
-	msgBox(G_STRINGS.ID_REQUIRED_FIELDS + ": \n "+G_STRINGS.ID_START_DATE,"alert"); return false;
+   if(!flag && getField('CALENDAR_NAME').value!=""){	msg+=G_STRINGS.ID_REQUIRED_FIELDS + ": \n\n ";}
+	 //msgBox(G_STRINGS.ID_REQUIRED_FIELDS + ": \n "+G_STRINGS.ID_START_DATE,"alert"); return false;
+	 msg +="- "+G_STRINGS.ID_START_DATE+"\n";
 	}
 	if(msg!=""){
+    //msgBox(msg,"alert");	
 		alert(msg);
 		return false;
 	}
-
-	return true;
+  document.CalendarDefinition.submit();
+	//return true;
 
 }