diff --git a/bug_update_page.php b/bug_update_page.php
index a855bca3a1..ce0185022a 100644
--- a/bug_update_page.php
+++ b/bug_update_page.php
@@ -269,13 +269,13 @@
 }
 
 #
-# Reporter
+# Reporter, Assigned To, Due Date
 #
 
-if( $t_show_reporter ) {
+if( $t_show_reporter || $t_show_handler || $t_show_due_date ) {
 	echo '<tr>';
 
-	$t_spacer = 4;
+	$t_spacer = 0;
 
 	if( $t_show_reporter ) {
 		# Reporter
@@ -285,7 +285,7 @@
 		# Do not allow the bug's reporter to edit the Reporter field
 		# when limit_reporters is ON
 		if( ON == config_get( 'limit_reporters' )
-		&&  !access_has_project_level( access_threshold_min_level( config_get( 'report_bug_threshold', null, null, $t_bug->project_id ) ) + 1, $t_bug->project_id )
+			&&  !access_has_project_level( access_threshold_min_level( config_get( 'report_bug_threshold', null, null, $t_bug->project_id ) ) + 1, $t_bug->project_id )
 		) {
 			echo string_attribute( user_get_name( $t_bug->reporter_id ) );
 		} else {
@@ -303,21 +303,6 @@
 		$t_spacer += 2;
 	}
 
-	# spacer
-	echo '<td colspan="', $t_spacer, '">&#160;</td>';
-
-	echo '</tr>';
-}
-
-#
-# Assigned To, Due Date
-#
-
-if( $t_show_handler || $t_show_due_date ) {
-	echo '<tr>';
-
-	$t_spacer = 0;
-
 	if ( $t_show_handler ) {
 		# Assigned To
 		echo '<th class="category"><label for="handler_id">' . lang_get( 'assigned_to' ) . '</label></th>';