diff --git a/spam/edit_report.cgi b/spam/edit_report.cgi
index 21bf66719..98b02bc08 100755
--- a/spam/edit_report.cgi
+++ b/spam/edit_report.cgi
@@ -49,10 +49,12 @@ $fold = &find("fold_headers", $conf);
 print &ui_table_row($text{'report_fold'},
 	&yes_no_field("fold_headers", $fold, 1));
 
-# Include details of spam phrases
-$detail = &find("detailed_phrase_score", $conf);
-print &ui_table_row($text{'report_detail'},
-	&yes_no_field("detailed_phrase_score", $detail, 0));
+if (!&version_atleast(2.6)) {
+	# Include details of spam phrases
+	$detail = &find("detailed_phrase_score", $conf);
+	print &ui_table_row($text{'report_detail'},
+		&yes_no_field("detailed_phrase_score", $detail, 0));
+	}
 
 if (!&version_atleast(2.6)) {
 	# Include stars header
diff --git a/spam/save_report.cgi b/spam/save_report.cgi
index 2e5ed07be..3750c48f6 100755
--- a/spam/save_report.cgi
+++ b/spam/save_report.cgi
@@ -41,7 +41,8 @@ else {
 	&parse_opt($conf, "spam_level_char", \&char_check);
 	}
 &parse_yes_no($conf, "fold_headers");
-&parse_yes_no($conf, "detailed_phrase_score");
+&parse_yes_no($conf, "detailed_phrase_score")
+	if (defined($in{'detailed_phrase_score'}));
 &parse_yes_no($conf, "defang_mime");
 &parse_option($conf, "report_safe") if (defined($in{'report_safe'}));