diff --git a/module/bug/control.php b/module/bug/control.php
index 1fce9d30ca..fb44e8d271 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -531,7 +531,6 @@ class bug extends control
     public function resolve($bugID)
     {
         $this->view->users = $this->user->getPairs('nodeleted');
-
         if(!empty($_POST))
         {
             $this->bug->resolve($bugID);
@@ -556,6 +555,7 @@ class bug extends control
         $this->view->header['title'] = $this->products[$productID] . $this->lang->colon . $this->lang->bug->resolve;
         $this->view->position[]      = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
         $this->view->position[]      = $this->lang->bug->resolve;
+        $this->view->date            = strftime("%Y-%m-%d %X", strtotime('now'));
 
         $this->view->bug     = $bug;
         $this->view->builds  = $this->loadModel('build')->getProductBuildPairs($productID);
diff --git a/module/bug/model.php b/module/bug/model.php
index fc023fec99..433d4f3a57 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -243,8 +243,9 @@ class bugModel extends model
      */
     public function resolve($bugID)
     {
-        $now = helper::now();
-        $bug = fixer::input('post')
+        $now    = helper::now();
+        $oldBug = $this->getById($bugID);
+        $bug    = fixer::input('post')
             ->add('resolvedBy',     $this->app->user->account)
             ->add('resolvedDate',   $now)
             ->add('status',         'resolved')
diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php
index a1c5db5879..842b45202a 100644
--- a/module/bug/view/resolve.html.php
+++ b/module/bug/view/resolve.html.php
@@ -26,6 +26,10 @@
       <td class='rowhead'><?php echo $lang->bug->resolvedBuild;?></td>
       <td><?php echo html::select('resolvedBuild', $builds, '', 'class=select-3');?></td>
     </tr>
+    <tr>
+      <td class='rowhead'><?php echo $lang->bug->resolvedDate;?></td>
+      <td><?php echo html::input('resolvedDate',$date, "class='select-3'");?></td>
+    </tr>
     <tr>
       <td class='rowhead'><?php echo $lang->bug->assignedTo;?></td>
       <td><?php echo html::select('assignedTo', $users, $bug->openedBy, 'class=select-3');?></td>
diff --git a/module/task/control.php b/module/task/control.php
index a8f7d0cf11..0c63bd7553 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -444,7 +444,8 @@ class task extends control
 
         $this->view->header->title = $this->view->project->name . $this->lang->colon .$this->lang->task->finish;
         $this->view->position[]    = $this->lang->task->finish;
-        
+        $this->view->date            = strftime("%Y-%m-%d %X", strtotime('now'));
+       
         $this->display();
     }
 
diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php
index d7dca9d9fe..4e87ddb9d8 100644
--- a/module/task/view/finish.html.php
+++ b/module/task/view/finish.html.php
@@ -17,7 +17,12 @@
     <tr>
       <th class='rowhead'><?php echo $lang->task->consumed;?></th>
       <td><?php echo html::input('consumed', $task->consumed, "class='text-3'") . $lang->task->hour;?></td>
-    </tr>  
+    </tr>
+    <tr>
+      <td class='rowhead'><?php echo $lang->task->finishedDate;?></td>
+      <td><?php echo html::input('finishedDate',$date, "class='select-3'");?></td>
+    </tr>
+
     <tr>
       <td class='rowhead'><?php echo $lang->comment;?></td>
       <td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>