diff --git a/sshd/edit_users.cgi b/sshd/edit_users.cgi
index 8acb0b03a..a17a87989 100755
--- a/sshd/edit_users.cgi
+++ b/sshd/edit_users.cgi
@@ -140,7 +140,12 @@ if ($version{'type'} eq 'openssh' && $version{'number'} >= 5) {
 				$text{'default'}." (6)"));
 	}
 
-print &ui_table_hr();
+if ($version{'type'} eq 'openssh' && $version{'number'} >= 5) {
+	# Challenge-response support
+	$chal = &find_value("ChallengeResponseAuthentication", $conf);
+	print &ui_table_row($text{'users_chal'},
+		&ui_yesno_radio('chal', lc($chal) eq 'yes'));
+	}
 
 if ($version{'type'} eq 'openssh' && $version{'number'} < 3.7 ||
     $version{'type'} eq 'ssh' && $version{'number'} < 2) {
diff --git a/sshd/lang/en b/sshd/lang/en
index ea6f8fa51..c417dd803 100644
--- a/sshd/lang/en
+++ b/sshd/lang/en
@@ -55,6 +55,7 @@ users_authkeys_set=File under home
 users_eauthkeys=Missing or invalid-looking authorized keys file
 users_maxauthtries=Maximum login attempts per connection
 users_emaxauthtries=Missing or non-numeric number of login attempts per connection
+users_chal=Use challenge-response authentication?
 
 net_title=Networking
 net_header=Networking options
diff --git a/sshd/save_users.cgi b/sshd/save_users.cgi
index b919adc35..89503bc5d 100755
--- a/sshd/save_users.cgi
+++ b/sshd/save_users.cgi
@@ -113,6 +113,11 @@ if ($version{'type'} eq 'openssh' && $version{'number'} < 3.7 ||
 			$in{'rhostsrsa'} ? 'yes' : 'no');
 	}
 
+if ($version{'type'} eq 'openssh' && $version{'number'} >= 5) {
+	&save_directive("ChallengeResponseAuthentication", $conf,
+			$in{'chal'} ? 'yes' : 'no');
+	}
+
 &save_directive("IgnoreRhosts", $conf, $in{'rhosts'} ? 'yes' : 'no');
 
 if ($version{'type'} eq 'ssh') {