diff --git a/module/story/js/create.js b/module/story/js/create.js
index e02e864943..761ef291f8 100644
--- a/module/story/js/create.js
+++ b/module/story/js/create.js
@@ -3,6 +3,15 @@ $(function()
     $('#needNotReview').on('change', function()
     {
         $('#reviewer').attr('disabled', $(this).is(':checked') ? 'disabled' : null).trigger('chosen:updated');
+        if($(this).is(':checked'))
+        {
+            $('#reviewerTd').removeClass('required');
+        }
+        else
+        {
+            $('#reviewerTd').addClass('required');
+        }
+
         getStatus('create', "product=" + $('#product').val() + ",execution=" + executionID + ",needNotReview=" + ($(this).prop('checked') ? 1 : 0));
     });
     $('#needNotReview').change();
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index 406f7b12ff..bd288c529a 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -101,7 +101,7 @@
           <tr>
             <th><?php echo $lang->story->reviewedBy;?></th>
             <?php $colspan = $type == 'story' ? "colspan='4'" : "colspan='2'";?>
-            <td <?php echo $colspan;?>>
+            <td <?php echo $colspan;?> id='reviewerTd'>
               <div class="table-row">
                 <div class="table-col">
                   <?php echo html::select('reviewer[]', $users, empty($needReview) ? $product->PO : '', "class='form-control chosen' multiple");?>