diff --git a/mailboxes/boxes-lib.pl b/mailboxes/boxes-lib.pl
index 3eb6ee2eb..69dd52fba 100755
--- a/mailboxes/boxes-lib.pl
+++ b/mailboxes/boxes-lib.pl
@@ -2907,7 +2907,7 @@ local $mail = { 'headers' =>
 		[ [ 'From', $from ],
 		  [ 'To', $to ],
 		  [ 'Cc', $cc ],
-		  [ 'Subject', $subject ] ],
+		  [ 'Subject', &encode_mimewords($subject) ] ],
 		'attach' => [ $attach ] };
 return &send_mail($mail, undef, 1, 0, $smtp);
 }
diff --git a/sshd/edit_users.cgi b/sshd/edit_users.cgi
index a17a87989..1d6d765b5 100755
--- a/sshd/edit_users.cgi
+++ b/sshd/edit_users.cgi
@@ -76,7 +76,8 @@ print &ui_table_row($text{'users_root'},
 	&ui_select("root", lc($root), \@opts));
 
 # SSH 1 RSA authentication
-if ($version{'type'} ne 'ssh' || $version{'number'} < 3) {
+if (($version{'type'} eq 'ssh' && $version{'number'} < 3) ||
+    ($version{'type'} eq 'openssh' && $version{'number'} < 7.3)) {
 	$rsa = &find_value("RSAAuthentication", $conf);
 	print &ui_table_row($text{'users_rsa'},
 		&ui_yesno_radio('rsa', lc($rsa) ne 'no'));
diff --git a/sshd/save_users.cgi b/sshd/save_users.cgi
index 89503bc5d..9cccb5eb7 100755
--- a/sshd/save_users.cgi
+++ b/sshd/save_users.cgi
@@ -47,7 +47,8 @@ if ($version{'type'} ne 'ssh' || $version{'number'} < 3) {
 
 &save_directive("PermitRootLogin", $conf, $in{'root'});
 
-if ($version{'type'} ne 'ssh' || $version{'number'} < 3) {
+if (($version{'type'} eq 'ssh' && $version{'number'} < 3) ||
+    ($version{'type'} eq 'openssh' && $version{'number'} < 7.3)) {
 	&save_directive("RSAAuthentication", $conf, $in{'rsa'} ? 'yes' : 'no');
 	}
 if ($version{'type'} eq 'openssh' && $version{'number'} >= 3) {