diff --git a/apps/tasks/ajax/edittaskform.php b/apps/tasks/ajax/edittaskform.php
index b9c1f700b6..651c26c498 100644
--- a/apps/tasks/ajax/edittaskform.php
+++ b/apps/tasks/ajax/edittaskform.php
@@ -8,19 +8,7 @@ OC_JSON::checkAppEnabled('tasks');
 $l10n = new OC_L10N('tasks');
 
 $id = $_GET['id'];
-$task = OC_Calendar_Object::find( $id );
-if( $task === false ){
-	OC_JSON::error(array('data' => array( 'message' => $l10n->t('Can not find Task!'))));
-	exit();
-}
-
-$calendar = OC_Calendar_Calendar::findCalendar( $task['calendarid'] );
-if( $calendar === false || $calendar['userid'] != OC_USER::getUser()){
-	OC_JSON::error(array('data' => array( 'message' => $l10n->t('This is not your task!'))));
-	exit();
-}
-
-$details = Sabre_VObject_Reader::read($task['calendardata'])->VTODO;
+$details = OC_Calendar_App::getVCalendar($id)->VTODO;
 $categories = array();
 if (isset($details->CATEGORIES)){
 	$categories = explode(',', $details->CATEGORIES->value);
@@ -35,7 +23,7 @@ $tmpl = new OC_Template('tasks','part.edittaskform');
 $tmpl->assign('category_options', $category_options);
 $tmpl->assign('percent_options', $percent_options);
 $tmpl->assign('priority_options', $priority_options);
-$tmpl->assign('task',$task);
+$tmpl->assign('id',$id);
 $tmpl->assign('details',$details);
 $tmpl->assign('categories', $categories);
 $page = $tmpl->fetchPage();
diff --git a/apps/tasks/index.php b/apps/tasks/index.php
index e2f559dfeb..f0e6c2e4dd 100644
--- a/apps/tasks/index.php
+++ b/apps/tasks/index.php
@@ -13,8 +13,8 @@ OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('tasks');
 
 $calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser(), true);
-if( count($calendars) == 0){
-	header('Location: ' . OC_HELPER::linkTo('calendar', 'index.php'));
+if( count($calendars) == 0 ) {
+	header('Location: ' . OC_Helper::linkTo('calendar', 'index.php'));
 	exit;
 }
 
diff --git a/apps/tasks/templates/part.edittaskform.php b/apps/tasks/templates/part.edittaskform.php
index 3e26c42038..fe123f07ac 100644
--- a/apps/tasks/templates/part.edittaskform.php
+++ b/apps/tasks/templates/part.edittaskform.php
@@ -1,5 +1,5 @@
 <form id="tasks_edittaskform">
-	<input type="hidden" name="id" value="<?php echo $_['task']['id']; ?>">
+	<input type="hidden" name="id" value="<?php echo $_['id']; ?>">
 	<?php echo $this->inc('part.taskform'); ?>
 	<input type="submit" name="submit" value="<?php echo $l->t('Update Task'); ?>">
 </form>