diff --git a/sshd/edit_host.cgi b/sshd/edit_host.cgi
index 0c73a4ff9..84cdcded7 100755
--- a/sshd/edit_host.cgi
+++ b/sshd/edit_host.cgi
@@ -66,6 +66,19 @@ $comp = &find_value("Compression", $conf);
 print &ui_table_row($text{'host_comp'},
 	&yes_no_default_radio("comp", $comp));
 
+# SSH compression level
+if ($version_type ne 'ssh' || $version_number < 3) {
+	if ($version_number < 6) {
+		$clevel = &find_value("CompressionLevel", $conf);
+		print &ui_table_row($text{'host_clevel'},
+			&ui_radio("clevel_def", $clevel ? 0 : 1,
+			[ [ 1, $text{'default'} ],
+				[ 0, &ui_select("clevel", $clevel,
+				[ map { [ $_, $text{"host_clevel_".$_} ] }
+					(1 .. 9) ]) ] ]));
+		}
+	}
+
 # Escape character in session
 $escape = &find_value("EscapeChar", $conf);
 print &ui_table_row($text{'host_escape'},
@@ -77,34 +90,29 @@ print &ui_table_row($text{'host_escape'},
 				$escape eq "none" ? "" : $escape, 4) ] ]));
 
 if ($version_type ne 'ssh' || $version_number < 3) {
-	# SSH compression level
-	$clevel = &find_value("CompressionLevel", $conf);
-	print &ui_table_row($text{'host_clevel'},
-		&ui_radio("clevel_def", $clevel ? 0 : 1,
-		  [ [ 1, $text{'default'} ],
-		    [ 0, &ui_select("clevel", $clevel,
-			   [ map { [ $_, $text{"host_clevel_".$_} ] }
-				 (1 .. 9) ]) ] ]));
-
 	# Number of times to attempt connection
 	$attempts = &find_value("ConnectionAttempts", $conf);
 	print &ui_table_row($text{'host_attempts'},
 		&ui_opt_textbox("attempts", $attempts, 5, $text{'default'}));
 
 	# Use local privileged port?
-	$priv = &find_value("UsePrivilegedPort", $conf);
-	print &ui_table_row($text{'host_priv'},
-		&yes_no_default_radio("priv", $priv));
+	if ($version_number < 7.4) {
+		$priv = &find_value("UsePrivilegedPort", $conf);
+		print &ui_table_row($text{'host_priv'},
+			&yes_no_default_radio("priv", $priv));
+		}
 
-	# Try RSH if SSH fails?
-	$rsh = &find_value("FallBackToRsh", $conf);
-	print &ui_table_row($text{'host_rsh'},
-		 &yes_no_default_radio("rsh", $rsh));
+	if ($version_number < 6) {
+		# Try RSH if SSH fails?
+		$rsh = &find_value("FallBackToRsh", $conf);
+		print &ui_table_row($text{'host_rsh'},
+			&yes_no_default_radio("rsh", $rsh));
+		# Use RSH only?
+		$usersh = &find_value("UseRsh", $conf);
+		print &ui_table_row($text{'host_usersh'},
+			&yes_no_default_radio("usersh", $usersh));
+		}
 
-	# Use RSH only?
-	$usersh = &find_value("UseRsh", $conf);
-	print &ui_table_row($text{'host_usersh'},
-		&yes_no_default_radio("usersh", $usersh));
 	}
 
 # Forward SSH agent?
@@ -133,14 +141,16 @@ if ($version_type eq 'openssh') {
 		&yes_no_default_radio('checkip', $checkip));
 
 	# SSH protocols to try
-	$prots = &find_value("Protocol", $conf);
-	print &ui_table_row($text{'host_prots'},
-		&ui_select("prots", $prots,
-			   [ [ '', $text{'default'} ],
-			     [ 1, $text{'host_prots1'} ],
-			     [ 2, $text{'host_prots2'} ],
-			     [ '1,2', $text{'host_prots12'} ],
-			     [ '2,1', $text{'host_prots21'} ] ], 1, 0, 1));
+	if ($version_number < 7.4) {
+		$prots = &find_value("Protocol", $conf);
+		print &ui_table_row($text{'host_prots'},
+			&ui_select("prots", $prots,
+				[ [ '', $text{'default'} ],
+					[ 1, $text{'host_prots1'} ],
+					[ 2, $text{'host_prots2'} ],
+					[ '1,2', $text{'host_prots12'} ],
+					[ '2,1', $text{'host_prots21'} ] ], 1, 0, 1));
+		}
 	}
 
 print &ui_table_hr();
diff --git a/sshd/save_host.cgi b/sshd/save_host.cgi
index 47c3fb406..fc3ba3812 100755
--- a/sshd/save_host.cgi
+++ b/sshd/save_host.cgi
@@ -113,12 +113,14 @@ else {
 
 	
 	if ($version_type ne 'ssh' || $version_number < 3) {
-		if ($in{'clevel_def'}) {
-			&save_directive("CompressionLevel", $conf);
-			}
-		else {
-			&save_directive("CompressionLevel", $conf,
-					$in{'clevel'});
+		if ($version_number < 6) {
+			if ($in{'clevel_def'}) {
+				&save_directive("CompressionLevel", $conf);
+				}
+			else {
+				&save_directive("CompressionLevel", $conf,
+						$in{'clevel'});
+				}
 			}
 
 		if ($in{'attempts_def'}) {
@@ -130,15 +132,20 @@ else {
 			&save_directive("ConnectionAttempts", $conf,
 					$in{'attempts'});
 			}
+		if ($version_number < 7.4) {
+			&save_directive("UsePrivilegedPort", $conf,
+				$in{'priv'} == 2 ? undef :
+					$in{'priv'} ? 'yes' : 'no');
+			}
+		if ($version_number < 6) {
+			&save_directive("FallBackToRsh", $conf,
+				$in{'rsh'} == 2 ? undef :
+					$in{'rsh'} ? 'yes' : 'no');
+			&save_directive("UseRsh", $conf,
+				$in{'usersh'} == 2 ? undef :
+					$in{'usersh'} ? 'yes' : 'no');
+			}
 
-		&save_directive("UsePrivilegedPort", $conf,
-			$in{'priv'} == 2 ? undef : $in{'priv'} ? 'yes' : 'no');
-
-		&save_directive("FallBackToRsh", $conf,
-			$in{'rsh'} == 2 ? undef : $in{'rsh'} ? 'yes' : 'no');
-
-		&save_directive("UseRsh", $conf,
-		    $in{'usersh'} == 2 ? undef : $in{'usersh'} ? 'yes' : 'no');
 		}
 
 	&save_directive("ForwardAgent", $conf,
@@ -155,7 +162,8 @@ else {
 		&save_directive("CheckHostIP", $conf,
 		  $in{'checkip'} == 2 ? undef : $in{'checkip'} ? 'yes' : 'no');
 
-		&save_directive("Protocol", $conf, $in{'prots'} || undef);
+		&save_directive("Protocol", $conf, $in{'prots'} || undef)
+			if ($version_number < 7.4);
 		}
 
 	for($i=0; defined($in{"llport_$i"}); $i++) {