diff --git a/module/story/js/change.js b/module/story/js/change.js
index 4a33c6cb57..3d075f1112 100644
--- a/module/story/js/change.js
+++ b/module/story/js/change.js
@@ -16,6 +16,8 @@ $(function()
     });
     $('#needNotReview').change();
 
+    if($('#reviewer').val()) loadAssignedTo();
+
     if($('.tabs .tab-content .tab-pane.active').children().length == 0) $('.tabs .nav-tabs li.active').css('border-bottom', '1px solid #ccc');
 });
 
diff --git a/module/story/js/create.js b/module/story/js/create.js
index 0dc61da541..150abcd111 100644
--- a/module/story/js/create.js
+++ b/module/story/js/create.js
@@ -17,6 +17,8 @@ $(function()
     });
     $('#needNotReview').change();
 
+    if($('#reviewer').val()) loadAssignedTo();
+
     // init pri selector
     $('#pri').on('change', function()
     {
@@ -34,13 +36,13 @@ $(function()
         if($.inArray(source, feedbackSource) != -1)
         {
             $('#feedbackBox').removeClass('hidden');
-            $('#reviewerBox').attr('colspan', 1);
+            $('#reviewerBox').attr('colspan', $('#assignedToBox').hasClass('hidden') ? 2 : 1);
             $('#assignedToBox').attr('colspan', 1);
         }
         else
         {
             $('#feedbackBox').addClass('hidden');
-            $('#reviewerBox').attr('colspan', 2);
+            $('#reviewerBox').attr('colspan', $('#assignedToBox').hasClass('hidden') ? 4 : 2);
             $('#assignedToBox').attr('colspan', 2);
         }
     });
diff --git a/module/story/view/change.html.php b/module/story/view/change.html.php
index 893a942896..2504454e81 100644
--- a/module/story/view/change.html.php
+++ b/module/story/view/change.html.php
@@ -24,7 +24,7 @@
       <table class='table table-form'>
         <tr>
           <th class='w-80px'><?php echo $lang->story->reviewedBy;?></th>
-          <td colspan='1' id='reviewerBox'>
+          <td colspan='2' id='reviewerBox'>
             <div class="input-group">
               <?php echo html::select('reviewer[]', $productReviewers, $reviewer, "class='form-control picker-select' multiple" . ($this->story->checkForceReview() ? ' required' : ''));?>
               <?php if(!$this->story->checkForceReview()):?>
@@ -34,7 +34,7 @@
               <?php endif;?>
             </div>
           </td>
-          <td colspan='1' id='assignedToBox'>
+          <td colspan='1' id='assignedToBox' class='hidden'>
             <div class='input-group'>
               <div class="input-group-addon"><?php echo $lang->story->assignedTo;?></div>
               <?php echo html::select('assignedTo', $users, '', "class='form-control picker-select'");?>
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index d86cb8df14..ef6586f763 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -103,7 +103,7 @@
           <?php endif;?>
           <tr>
             <th><?php echo $lang->story->reviewedBy;?></th>
-            <td colspan='<?php echo $type == 'story' ? 2 : 1;?>' id='reviewerBox'>
+            <td colspan='<?php echo $type == 'story' ? 4 : 2;?>' id='reviewerBox'>
               <div class="table-row">
                 <?php if(!$this->story->checkForceReview()):?>
                 <div class="table-col">
@@ -124,7 +124,7 @@
                 <?php endif;?>
               </div>
             </td>
-            <td colspan='<?php echo $type == 'story' ? 2 : 1;?>' id='assignedToBox'>
+            <td colspan='<?php echo $type == 'story' ? 2 : 1;?>' id='assignedToBox' class='hidden'>
               <div class='input-group'>
                 <div class="input-group-addon"><?php echo $lang->story->assignedTo;?></div>
                 <?php echo html::select('assignedTo', $users, '', "class='form-control picker-select'");?>