diff --git a/module/task/js/create.js b/module/task/js/create.js
index 36e63a45ff..0dcd61d073 100644
--- a/module/task/js/create.js
+++ b/module/task/js/create.js
@@ -343,7 +343,7 @@ function setStories(moduleID, executionID)
         $("#story").addClass('filled').chosen();
 
         /* If there is no story option, select will be hidden and text will be displayed; otherwise, the opposite is true */
-        if($('#story option').length > 1)
+        if($('#story option').length > 1 || parseInt(hasProduct) == 0)
         {
             $('#story').parent().removeClass('hidden');
             $('#storyBox').addClass('hidden');
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index f66321ccb0..8e2f516d47 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -23,6 +23,7 @@
 <?php js::set('estimateNotEmpty', sprintf($lang->error->gt, $lang->task->estimate, '0'))?>
 <?php js::set('lifetime', $execution->lifetime);?>
 <?php js::set('lifetimeList', $lifetimeList);?>
+<?php js::set('hasProduct', $execution->hasProduct);?>
 <?php
 $requiredFields = array();
 foreach(explode(',', $config->task->create->requiredFields) as $field)