diff --git a/mysql/edit_user.cgi b/mysql/edit_user.cgi
index 60f1b2919..a6751c4e7 100755
--- a/mysql/edit_user.cgi
+++ b/mysql/edit_user.cgi
@@ -84,6 +84,8 @@ if ($mysql_version >= 5 && $fieldmap{'ssl_type'}) {
 			  [ 'ANY', $text{'user_ssl_any'} ],
 			  [ 'X509', $text{'user_ssl_x509'} ] ],
 			1, 0, 1));
+	print &ui_table_row($text{'user_cipher'},
+		&ui_textbox("ssl_cipher", $u->[$fieldmap{'ssl_cipher'}], 80));
 	}
 
 print &ui_table_end();
diff --git a/mysql/lang/en b/mysql/lang/en
index b0db334e2..d1f9c45af 100644
--- a/mysql/lang/en
+++ b/mysql/lang/en
@@ -320,6 +320,7 @@ user_err=Failed to save user
 user_euser=Missing or invalid username
 user_ehost=Missing or invalid allow host(s)
 user_ssl=Required certificate type
+user_cipher=SSL cipher
 user_ssl_=None
 user_ssl_any=SSL
 user_ssl_x509=X509
diff --git a/mysql/save_user.cgi b/mysql/save_user.cgi
index 2c242019c..9dac79ac9 100755
--- a/mysql/save_user.cgi
+++ b/mysql/save_user.cgi
@@ -22,6 +22,7 @@ else {
 
 	map { $perms[$_]++ } split(/\0/, $in{'perms'});
 	@desc = &table_structure($master_db, 'user');
+	%fieldmap = map { $_->{'field'}, $_->{'index'} } @desc;
 	$host = $in{'host_def'} ? '%' : $in{'host'};
 	$user = $in{'mysqluser_def'} ? '' : $in{'mysqluser'};
 	if ($in{'new'}) {
@@ -29,10 +30,18 @@ else {
 		for($i=3; $i<=&user_priv_cols()+3-1; $i++) {
 			push(@yesno, $perms[$i] ? "'Y'" : "'N'");
 			}
+		foreach my $f ('ssl_type', 'ssl_cipher') {
+			if ($fieldmap{$f}) {
+				push(@ssl_field_names, $f);
+				push(@ssl_field_values, "''");
+				}
+			}
 		$sql = sprintf "insert into user (%s) values ('%s', '%s', '', %s)",
-			join(",", map { $desc[$_]->{'field'} } (0 .. &user_priv_cols()+3-1)),
+			join(",", (map { $desc[$_]->{'field'} }
+				      (0 .. &user_priv_cols()+3-1)),
+				  @ssl_field_names),
 			$host, $user,
-			join(",", @yesno);
+			join(",", @yesno, @ssl_field_values);
 		}
 	else {
 		# Update existing user
@@ -75,9 +84,9 @@ else {
 	# Set SSL fields
 	if ($mysql_version >= 5 && defined($in{'ssl_type'})) {
 		&execute_sql_logged($master_db,
-			"update user set ssl_type = ? ".
+			"update user set ssl_type = ? and ssl_cipher = ? ".
 			"where user = ? and host = ?",
-			$in{'ssl_type'}, $user, $host);
+			$in{'ssl_type'}, $in{'ssl_cipher'}, $user, $host);
 		}
 	}
 &execute_sql_logged($master_db, 'flush privileges');