diff --git a/module/repo/control.php b/module/repo/control.php
index 9eb502a03e..c0ea44aaba 100644
--- a/module/repo/control.php
+++ b/module/repo/control.php
@@ -302,6 +302,7 @@ class repo extends control
         $this->view->file         = $file;
         $this->view->entry        = $entry;
         $this->view->path         = $entry;
+        $this->view->info         = $info;
         $this->view->suffix       = $suffix;
         $this->view->content      = $content ? $content : '';
         $this->view->pathInfo     = $pathInfo;
diff --git a/module/task/model.php b/module/task/model.php
index e6e3499c11..58705bfc4e 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1745,8 +1745,10 @@ class taskModel extends model
         foreach($record->dates    as $id => $item) if($item > $today) dao::$errors[] = 'ID #' . $id . ' ' . $this->lang->task->error->date;
         if(dao::isError()) return false;
 
+        $task = $this->getById($taskID);
+        if(!empty($task->team) and !isset($task->team[$this->app->user->account])) return false;
+
         $estimates    = array();
-        $task         = $this->getById($taskID);
         $earliestTime = '';
         foreach(array_keys($record->id) as $id)
         {