diff --git a/bind8/bind8-lib.pl b/bind8/bind8-lib.pl
index 33c1673b5..b94586b3e 100755
--- a/bind8/bind8-lib.pl
+++ b/bind8/bind8-lib.pl
@@ -690,9 +690,9 @@ my ($addr, @vals, $dir);
 my @sp = split(/\s+/, $in{$_[0]});
 for(my $i=0; $i<@sp; $i++) {
 	!$_[3] || &check_ipaddress($sp[$i]) || &error(&text('eip', $sp[$i]));
-	if (lc($sp[$i+1]) eq "key") {
-		push(@vals, { 'name' => $sp[$i++],
-			      'values' => [ "key", $sp[++$i] ] });
+	if (lc($sp[$i]) eq "key") {
+		push(@vals, { 'name' => $sp[$i],
+			      'values' => [ "\"".$sp[++$i]."\"" ] });
 		}
 	else {
 		push(@vals, { 'name' => $sp[$i] });