diff --git a/module/bug/control.php b/module/bug/control.php
index b5f540484f..113317472e 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -156,6 +156,7 @@ class bug extends control
         $taskID    = 0;
         $storyID   = 0;
         $buildID   = 0;
+        $caseID    = 0;
         $runID     = 0;
         $title     = '';
         $steps     = '';
@@ -185,6 +186,7 @@ class bug extends control
         $this->view->taskID           = $taskID;
         $this->view->storyID          = $storyID;
         $this->view->buildID          = $buildID;
+        $this->view->caseID           = $caseID;
         $this->view->title            = $title;
         $this->view->steps            = $steps;
         $this->display();
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 14187e3d42..7c7dfcaa21 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -170,7 +170,7 @@ function loadProjectBuilds(projectID)
       </tr>  
       <tr>
         <td colspan='2'>
-          <?php echo html::submitButton() . html::resetButton();?>
+          <?php echo html::submitButton() . html::resetButton() . html::hidden('case', $caseID);?>
         </td>
       </tr>
     </table>
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 8bc5b18739..1aeefa94e4 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -190,7 +190,7 @@
         </tr>
         <tr>
           <td class='rowhead'><?php echo $lang->bug->case;?></td>
-          <td><?php if(isset($bug->caseTitle)) echo html::a($this->createLink('testcase', 'view', "caseID=$bug->case"), "#$bug->case $linkBugTitle", '_blank');?></td>
+          <td><?php if(isset($bug->caseTitle)) echo html::a($this->createLink('testcase', 'view', "caseID=$bug->case"), "#$bug->case $bug->caseTitle", '_blank');?></td>
         </tr>
       </table>
     </fieldset>
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index 968719d235..d0499c4d3f 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -26,7 +26,7 @@
 <?php include '../../common/colorize.html.php';?>
 <div class='yui-d0'>
   <div id='featurebar'>
-    <div class='f-right'><?php common::printLink('bug', 'create', "productID=0&project=$project->id", $lang->bug->create);?></div>
+    <div class='f-right'><?php common::printLink('bug', 'create', "productID=0&extra=projectID=$project->id", $lang->bug->create);?></div>
   </div>
 </div>
 <div class='yui-d0'>
diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php
index 090c91a066..16df22aea7 100644
--- a/module/testtask/view/view.html.php
+++ b/module/testtask/view/view.html.php
@@ -110,7 +110,7 @@ function checkall(checker)
               <?php
               common::printLink('testtask', 'runcase',    "id=$run->id", $lang->testtask->runCase, '', 'class="iframe"');
               common::printLink('testtask', 'results',    "id=$run->id", $lang->testtask->results, '', 'class="iframe"');
-              common::printLink('bug',      'create',     "product=$productID&extra=projectID=$task->project,buildID=$task->build,runID=$run->id", $lang->testtask->createBug);
+              common::printLink('bug',      'create',     "product=$productID&extra=projectID=$task->project,buildID=$task->build,caseID=$run->case,runID=$run->id", $lang->testtask->createBug);
               common::printLink('testtask', 'unlinkcase', "id=$run->id", $lang->testtask->unlinkCase, 'hiddenwin');
               ?>
             </td>