diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index 6d785b1322..4ee8b2ef95 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -48,9 +48,9 @@
     <?php foreach($tasks as $task):?>
     <?php $class = $task->owner == $app->user->account ? 'style=color:red' : '';?>
     <tr class='a-center'>
-      <td><?php if(common::hasPriv('task', 'view')) echo html::a($this->createLink('task', 'view', "task=$task->id"), sprintf('%03d', $task->id)); else printf('%03d', $task->id);?></td>
+      <td><?php if(!common::printLink('task', 'view', "task=$task->id", sprintf('%03d', $task->id))) printf('%03d', $task->id);?></td>
       <td><?php echo $task->pri;?></td>
-      <td class='a-left nobr'><?php echo $task->name;?></td>
+      <td class='a-left nobr'><?php if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name;?></td>
       <td <?php echo $class;?>><?php echo $task->ownerRealName;?></td>
       <td><?php echo $task->estimate;?></td>
       <td><?php echo $task->consumed;?></td>
@@ -68,8 +68,8 @@
         ?>
       </td>
       <td>
-        <?php if(common::hasPriv('task', 'edit'))   echo html::a($this->createLink('task', 'edit',   "taskid=$task->id"), $lang->edit);?>
-        <?php if(common::hasPriv('task', 'delete')) echo html::a($this->createLink('task', 'delete', "projectID=$task->project&taskid=$task->id"), $lang->delete, 'hiddenwin');?>
+        <?php common::printLink('task', 'edit',   "taskid=$task->id", $lang->edit);?>
+        <?php common::printLink('task', 'delete', "projectID=$task->project&taskid=$task->id", $lang->delete, 'hiddenwin');?>
       </td>
     </tr>
     <?php endforeach;?>