diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php
index dbd7c39879..398a6bacc4 100644
--- a/module/task/view/recordestimate.html.php
+++ b/module/task/view/recordestimate.html.php
@@ -59,7 +59,7 @@
             <?php if(empty($task->team) or $task->assignedTo == $this->app->user->account):?>
             <td align='center' class='c-actions'>
               <?php
-              if($task->status == 'wait' or $task->status == 'pause' or $task->status == 'doing')
+              if(($task->status == 'wait' or $task->status == 'pause' or $task->status == 'doing') and ($this->app->user->admin or $this->app->user->account == $estimate->account))
               {
                   common::printIcon('task', 'editEstimate', "estimateID=$estimate->id", '', 'list', 'pencil', '', 'showinonlybody', true);
                   common::printIcon('task', 'deleteEstimate', "estimateID=$estimate->id", '', 'list', 'close', 'hiddenwin', 'showinonlybody');
diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php
index a8de327a32..f9b57cf3a2 100644
--- a/module/todo/view/view.html.php
+++ b/module/todo/view/view.html.php
@@ -38,15 +38,10 @@
       <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=todo&objectID=$todo->id");?>
       <?php include '../../common/view/action.html.php';?>
     </div>
+
     <div class='main-actions'>
       <div class="btn-toolbar">
         <?php
-        if($todo->status == 'wait') common::printLink('todo', 'start', "todoID=$todo->id", "<i class='icon icon-play'></i>", 'hiddenwin', "title='{$lang->todo->start}' class='btn showinonlybody'");
-        if($todo->status == 'done' || $todo->status == 'closed') common::printLink('todo', 'activate', "todoID=$todo->id", "<i class='icon icon-magic'></i>", 'hiddenwin', "title='{$lang->todo->activate}' class='btn showinonlybody'");
-        if($todo->status == 'done') common::printLink('todo', 'close', "todoID=$todo->id", "<i class='icon icon-off'></i>", 'hiddenwin', "title='{$lang->todo->close}' class='btn showinonlybody'");
-        common::printLink('todo', 'edit', "todoID=$todo->id", "<i class='icon icon-edit'></i>", '', "title='{$lang->todo->edit}' class='btn showinonlybody'");
-        common::printLink('todo', 'delete', "todoID=$todo->id", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->todo->delete}' class='btn showinonlybody'");
-
         if($this->session->todoList)
         {
             $browseLink = $this->session->todoList;
@@ -60,28 +55,36 @@
             $browseLink = $this->createLink('user', 'todo', "account=$todo->account");
         }
 
-        if($todo->status != 'done' && $todo->status != 'closed')
+        if($this->app->user->admin or ($this->app->user->account == $todo->account) or ($this->app->user->account == $todo->assignedTo))
         {
-            echo "<div class='btn-group dropup'>";
-            echo html::a($this->createLink('todo', 'finish', "id=$todo->id", 'html', true), "<i class='icon icon-checked'></i>", 'hiddenwin', "title='{$lang->todo->finish}' class='btn showinonlybody btn-success'");
-            $createStoryPriv = common::hasPriv('story', 'create');
-            $createTaskPriv  = common::hasPriv('task', 'create');
-            $createBugPriv   = common::hasPriv('bug', 'create');
-            if($createStoryPriv or $createTaskPriv or $createBugPriv)
-            {
-                $isonlybody = isonlybody();
-                unset($_GET['onlybody']);
-                echo "<button type='button' class='btn btn-success dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>";
-                echo "<ul class='dropdown-menu pull-right' role='menu'>";
-                if($createStoryPriv) echo '<li>' . html::a('###', $lang->todo->reasonList['story'], '', "data-toggle='modal' data-target='#productModal' data-backdrop='false' data-moveable='true' data-position='center' id='toStoryLink'") . '</li>';
-                if($createTaskPriv)  echo '<li>' . html::a('###', $lang->todo->reasonList['task'], '', "data-toggle='modal' data-target='#projectModal' data-backdrop='false' data-moveable='true' data-position='center' id='toTaskLink'") . '</li>';
-                if($createBugPriv)   echo '<li>' . html::a('###', $lang->todo->reasonList['bug'], '', "data-toggle='modal' data-target='#productModal' data-backdrop='false' data-moveable='true' data-position='center' id='toBugLink'") . '</li>';
-                echo "</ul>";
-                if($isonlybody) $_GET['onlybody'] = 'yes';
-            }
-            echo "</div>";
-        }
+            if($todo->status == 'wait') common::printLink('todo', 'start', "todoID=$todo->id", "<i class='icon icon-play'></i>", 'hiddenwin', "title='{$lang->todo->start}' class='btn showinonlybody'");
+            if($todo->status == 'done' || $todo->status == 'closed') common::printLink('todo', 'activate', "todoID=$todo->id", "<i class='icon icon-magic'></i>", 'hiddenwin', "title='{$lang->todo->activate}' class='btn showinonlybody'");
+            if($todo->status == 'done') common::printLink('todo', 'close', "todoID=$todo->id", "<i class='icon icon-off'></i>", 'hiddenwin', "title='{$lang->todo->close}' class='btn showinonlybody'");
+            common::printLink('todo', 'edit', "todoID=$todo->id", "<i class='icon icon-edit'></i>", '', "title='{$lang->todo->edit}' class='btn showinonlybody'");
+            common::printLink('todo', 'delete', "todoID=$todo->id", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->todo->delete}' class='btn showinonlybody'");
 
+            if($todo->status != 'done' && $todo->status != 'closed')
+            {
+                echo "<div class='btn-group dropup'>";
+                echo html::a($this->createLink('todo', 'finish', "id=$todo->id", 'html', true), "<i class='icon icon-checked'></i>", 'hiddenwin', "title='{$lang->todo->finish}' class='btn showinonlybody btn-success'");
+                $createStoryPriv = common::hasPriv('story', 'create');
+                $createTaskPriv  = common::hasPriv('task', 'create');
+                $createBugPriv   = common::hasPriv('bug', 'create');
+                if($createStoryPriv or $createTaskPriv or $createBugPriv)
+                {
+                    $isonlybody = isonlybody();
+                    unset($_GET['onlybody']);
+                    echo "<button type='button' class='btn btn-success dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>";
+                    echo "<ul class='dropdown-menu pull-right' role='menu'>";
+                    if($createStoryPriv) echo '<li>' . html::a('###', $lang->todo->reasonList['story'], '', "data-toggle='modal' data-target='#productModal' data-backdrop='false' data-moveable='true' data-position='center' id='toStoryLink'") . '</li>';
+                    if($createTaskPriv)  echo '<li>' . html::a('###', $lang->todo->reasonList['task'], '', "data-toggle='modal' data-target='#projectModal' data-backdrop='false' data-moveable='true' data-position='center' id='toTaskLink'") . '</li>';
+                    if($createBugPriv)   echo '<li>' . html::a('###', $lang->todo->reasonList['bug'], '', "data-toggle='modal' data-target='#productModal' data-backdrop='false' data-moveable='true' data-position='center' id='toBugLink'") . '</li>';
+                    echo "</ul>";
+                    if($isonlybody) $_GET['onlybody'] = 'yes';
+                }
+                echo "</div>";
+            }
+        }
         common::printRPN($browseLink);
         ?>
       </div>