diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addChefJobEventCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addChefJobEventCtrl.js
index 97eee0a54..f88a98464 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addChefJobEventCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addChefJobEventCtrl.js
@@ -11,10 +11,24 @@
 		.controller('addChefJobEventCtrl',['$scope', '$modalInstance', 'items' ,'toastr',function($scope, $modalInstance , items , toastr){
 			console.log(items);
 			if(items.type !== 'new'){
-				$scope.schedulerStartOn = items.chefJenkScriptTaskObj.cronStart;
-				$scope.schedulerEndOn = items.chefJenkScriptTaskObj.cronEnd;
-				$scope.repeatBy = items.chefJenkScriptTaskObj.repeatBy;
-				$scope.repeatsType = items.chefJenkScriptTaskObj.repeats;
+				if(items.chefJenkScriptTaskObj.cronStartOn && items.chefJenkScriptTaskObj.cronEndOn) {
+					var newStartOn = parseInt(items.chefJenkScriptTaskObj.cronStartOn);
+					var newDate = new Date(newStartOn).toLocaleDateString();
+					var datearray = newDate.split("/");
+					var newdate = datearray[1] + '/' + datearray[0] + '/' + datearray[2];
+					$scope.schedulerStartOn = newdate;
+					var newEndOn = parseInt(items.chefJenkScriptTaskObj.cronEndOn);
+					var newEndData = new Date(newEndOn).toLocaleDateString();	
+					var datearrayNew = newEndData.split("/");
+					var newdateEnd = datearrayNew[1] + '/' + datearrayNew[0] + '/' + datearrayNew[2];
+					$scope.schedulerEndOn = newdateEnd;
+				} else {
+					$scope.schedulerStartOn = items.chefJenkScriptTaskObj.cronStart;
+					$scope.schedulerEndOn = items.chefJenkScriptTaskObj.cronEnd;	
+				}
+				
+				$scope.repeatBy = items.chefJenkScriptTaskObj.repeatBy || items.chefJenkScriptTaskObj.cronRepeatEvery.toString();
+				$scope.repeatsType = items.chefJenkScriptTaskObj.repeats || items.chefJenkScriptTaskObj.cronFrequency;
 				$scope.timeEventType = items.chefJenkScriptTaskObj.startTime;
 				$scope.timeEventMinute = items.chefJenkScriptTaskObj.startTimeMinute;
 				$scope.weekOfTheDay = items.chefJenkScriptTaskObj.dayOfWeek;
@@ -27,14 +41,18 @@
             	$scope.schedulerEndOn=moment(new Date()).format('MM/DD/YYYY');
 			}
 
+			
 			$scope.dateChange= function () {
-                var startDate =  Date.parse($scope.schedulerStartOn);
-                var endDate =  Date.parse($scope.schedulerEndOn);
+				var startDate =  Date.parse($scope.schedulerStartOn);
+	            var endDate =  Date.parse($scope.schedulerEndOn);
                 if(startDate > endDate){
                     $scope.validDateRange=true;
                 } else {
                     $scope.validDateRange=false;
                 }
+                if(startDate = endDate){
+                	$scope.validDateRange=true;
+            	}
             };
 
 			$scope.repeatCount = function(max, step) {
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js
index 5bfdf69e6..d64bc630c 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js
@@ -416,12 +416,7 @@
 							$scope.taskSaving = false;
 							return false;
 						}
-						if (!taskJSON.nodeIds.length) {
-							$scope.inputValidationMsg='Please select a node';
-							$scope.taskSaving = false;
-							return false;
-						}
-
+						
 						for (var k = 0; k < $scope.scriptTaskList.length; k++) {
 							if ($scope.scriptTaskList[k]._isScriptSelected) {
 								var scriptId = $scope.scriptTaskList[k]._id;
@@ -700,13 +695,13 @@
 					$scope.isExecution.flag = items.taskConfig.executionOrder;
 				}
 				if(items.taskType === "chef" || items.taskType === "jenkins" || items.taskType === "script") {
-					if(items.cron){
-						$scope._isEventSelected = items.isScheduled;
+					//if(items.taskScheduler){
+						$scope._isEventSelected = items.isTaskScheduled;
 						$scope.showAddTask = true;
 						$scope.isEventAvailable = true;
 						$scope.chefJenkScriptTaskObj = items.taskScheduler;
 						$scope.type = 'edit';
-					}
+					//}
 				}
 			}
 		}