diff --git a/include/staff/templates/dynamic-form.tmpl.php b/include/staff/templates/dynamic-form.tmpl.php
index aaaf1bf696bd2481f2280ce707064ec5da621ea2..d44d3062b27cdbb497f2242dec90ba2eb1e2e709 100644
--- a/include/staff/templates/dynamic-form.tmpl.php
+++ b/include/staff/templates/dynamic-form.tmpl.php
@@ -6,8 +6,10 @@ if (isset($options['entry']) && $options['mode'] == 'edit'
     && ($_POST['forms'] && !in_array($options['entry']->getId(), $_POST['forms']))
 )
     return;
-?>
+
+if (isset($options['entry']) && $options['mode'] == 'edit') { ?>
 <tbody>
+<?php } ?>
     <tr><td style="width:<?php echo $options['width'] ?: 150;?>px;"></td><td></td></tr>
 <?php
 // Keep up with the entry id in a hidden field to decide what to add and
@@ -79,5 +81,7 @@ if (isset($options['entry']) && $options['mode'] == 'edit') { ?>
             <?php } ?>
             </div></td>
         </tr>
-    <?php } ?>
+    <?php }
+if (isset($options['entry']) && $options['mode'] == 'edit') { ?>
 </tbody>
+<?php } ?>
diff --git a/scp/css/scp.css b/scp/css/scp.css
index 5a941720036dd094ab0f5fe74b1e115a6005ed4b..416ee3850dbae1dce7c7c07eab6f32a07656a92d 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -550,8 +550,10 @@ a.print {
     border-right:1px solid #ddd;
 }
 
-.form_table td:not(:empty) {
+.form_table td {
     border-bottom:1px solid #ddd;
+}
+.form_table td:not(:empty) {
     height: 20px;
 }