diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index f9ec29cb65..bee8be3ff1 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -143,11 +143,11 @@ function loadAllProjectBuilds(projectID, productID)
         link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=openedBuild&build=' + oldOpenedBuild + '&branch=' + branch + '&index=0&needCreate=true&type=all');
         $.get(link, function(data)
         {
-            notice();
             if(!data) data = '<select id="openedBuild" name="openedBuild" class="form-control" multiple=multiple></select>';
             $('#openedBuild').replaceWith(data);
             $('#openedBuild_chosen').remove();
             $("#openedBuild").chosen();
+            notice();
         })
     }
     if(page == 'edit')
@@ -181,11 +181,11 @@ function loadAllProductBuilds(productID)
         link = createLink('build', 'ajaxGetProductBuilds', 'productID=' + productID + '&varName=openedBuild&build=' + oldOpenedBuild + '&branch=' + branch + '&index=0&type=all');
         $.get(link, function(data)
         {
-            notice();
             if(!data) data = '<select id="openedBuild" name="openedBuild" class="form-control" multiple=multiple></select>';
             $('#openedBuild').replaceWith(data);
             $('#openedBuild_chosen').remove();
             $("#openedBuild").chosen();
+            notice();
         })
     }
     if(page == 'edit')
@@ -282,13 +282,13 @@ function loadProductBuilds(productID)
 
     if(page == 'create')
     {
-        notice();
         $.get(link, function(data)
         {
             if(!data) data = '<select id="openedBuild" name="openedBuild" class="form-control" multiple=multiple></select>';
             $('#openedBuild').replaceWith(data);
             $('#openedBuild_chosen').remove();
             $("#openedBuild").chosen();
+            notice();
         })
     }
     else
@@ -373,7 +373,6 @@ function loadProjectBuilds(projectID)
 
     if(page == 'create')
     {
-        notice();
         link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=openedBuild&build=' + oldOpenedBuild + "&branch=" + branch + "&index=0&needCreate=true");
         $.get(link, function(data)
         {
@@ -381,6 +380,7 @@ function loadProjectBuilds(projectID)
             $('#openedBuild').replaceWith(data);
             $('#openedBuild_chosen').remove();
             $("#openedBuild").chosen();
+            notice();
         })
     }
     else
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index d8af1d7ef6..fd3a912d88 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -117,7 +117,7 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
             </td>
           </tr>
           <?php endif;?>
-
+          <?php if($this->config->global->flow != 'onlyTest' && $showProject):?>
           <?php $showOS      = strpos(",$showFields,", ',os,')      !== false;?>
           <?php $showBrowser = strpos(",$showFields,", ',browser,') !== false;?>
           <tr>
@@ -142,6 +142,7 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
               </div>
             </td>
           </tr>
+          <?php endif;?>
           <tr>
             <th><?php echo $lang->bug->title;?></th>
             <td colspan='2'>