diff --git a/workflow/engine/classes/model/CalendarDefinition.php b/workflow/engine/classes/model/CalendarDefinition.php
index 18efe229f..076393d07 100755
--- a/workflow/engine/classes/model/CalendarDefinition.php
+++ b/workflow/engine/classes/model/CalendarDefinition.php
@@ -346,7 +346,7 @@ class CalendarDefinition extends BaseCalendarDefinition {
 
 
   }
-  function getCalendarFor($userUid, $proUid, $tasUid) {
+  function getCalendarFor($userUid, $proUid, $tasUid, $sw_validate=true) {
     $Criteria = new Criteria ( 'workflow' );
 
     //Default Calendar
@@ -386,7 +386,11 @@ class CalendarDefinition extends BaseCalendarDefinition {
     }
 
     //print "<h1>$calendarUid</h1>";
+    if($sw_validate){
     $calendarDefinition = $this->getCalendarInfo ( $calendarUid );
+    }else{
+      $calendarDefinition = $this->getCalendarInfoE ( $calendarUid );
+    }
     $calendarDefinition ['CALENDAR_APPLIED'] = $calendarOwner;
     $this->addCalendarLog ( "--=== Calendar Applied: " . $calendarDefinition ['CALENDAR_NAME'] . " -> $calendarOwner" );
     return $calendarDefinition;