diff --git a/fail2ban/save_jail.cgi b/fail2ban/save_jail.cgi
index 2decf1ac1..406b506dd 100755
--- a/fail2ban/save_jail.cgi
+++ b/fail2ban/save_jail.cgi
@@ -85,7 +85,11 @@ else {
 		if ($in{"protocol_$i"}) {
 			push(@opts, "protocol=".$in{"protocol_$i"});
 			}
-		push(@opts, split(/\s+/, $in{"others_$i"}));
+		foreach my $oo (split(/\s+/, $in{"others_$i"})) {
+			my ($n, $v) = split(/=/, $oo, 2);
+			$v = "\"$v\"" if ($v =~ /\s|,|=/);
+			push(@opts, "$n=$v");
+			}
 		push(@actions, $in{"action_$i"}."[".join(", ", @opts)."]");
 		}