diff --git a/module/task/control.php b/module/task/control.php
index cb5aa720ac..ccbce0d2af 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -738,16 +738,12 @@ class task extends control
             die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
         }
 
-        $users      = $this->loadModel('user')->getPairs('noletter');
-        $members    = $this->loadModel('project')->getTeamMemberPairs($task->project, 'nodeleted');
-        $assignedTo = in_array(zget($this->app->user->account, $users), $members) === TRUE ? $this->app->user->account : '';
-
         $this->view->title      = $this->view->project->name . $this->lang->colon .$this->lang->task->start;
         $this->view->position[] = $this->lang->task->start;
 
-        $this->view->users      = $users;
-        $this->view->members    = $members;
-        $this->view->assignedTo = $task->assignedTo == '' ? $assignedTo : $task->assignedTo;
+        $this->view->users      = $this->loadModel('user')->getPairs('noletter');
+        $this->view->members    = $this->loadModel('project')->getTeamMemberPairs($task->project, 'nodeleted');
+        $this->view->assignedTo = $task->assignedTo == '' ? $this->app->user->account : $task->assignedTo;
         $this->display();
     }