diff --git a/bind8/find_zones.cgi b/bind8/find_zones.cgi
index 15e4cb6f8..9c5538730 100755
--- a/bind8/find_zones.cgi
+++ b/bind8/find_zones.cgi
@@ -26,6 +26,10 @@ foreach my $z (@zones) {
 		 $v eq "." || !&can_edit_zone($z) ||
 		 &arpa_to_ip($v) !~ /\Q$in{'search'}\E/i);
 	my $t = $z->{'type'};
+	next if (!$t);
+	$t = "delegation" if ($t eq "delegation-only");
+	$t = "master" if ($t eq "primary");
+	$t = "slave" if ($t eq "secondary");
 	if ($z->{'view'}) {
 		push(@zlinks, "edit_$t.cgi?zone=$z->{'name'}".
 			      "&view=$z->{'viewindex'}");