diff --git a/bind8/conf_servers.cgi b/bind8/conf_servers.cgi
index 879a338e0..0ccd8a53b 100755
--- a/bind8/conf_servers.cgi
+++ b/bind8/conf_servers.cgi
@@ -20,7 +20,7 @@ print &ui_columns_start([ $text{'servers_ip'},
 for($i=0; $i<@servers; $i++) {
 	$s = $servers[$i];
 	@cols = ( );
-	push(@cols, &ui_textbox("ip_$i", $s->{'value'}, 15));
+	push(@cols, &ui_textbox("ip_$i", $s->{'value'}, 30));
 
 	$bogus = &find_value("bogus", $s->{'members'});
 	push(@cols, &ui_radio("bogus_$i", lc($bogus) eq 'yes' ? 1 : 0,
diff --git a/bind8/save_servers.cgi b/bind8/save_servers.cgi
index 0ee104475..c908a96d4 100755
--- a/bind8/save_servers.cgi
+++ b/bind8/save_servers.cgi
@@ -12,7 +12,8 @@ $conf = &get_config();
 @old = &find("server", $conf);
 for($i=0; defined($ip = $in{"ip_$i"}); $i++) {
 	next if (!$ip);
-	&check_ipaddress($ip) || &error(&text('servers_eip', $ip));
+	&check_ipaddress($ip) || &check_ip6address($ip) ||
+		&error(&text('servers_eip', $ip));
 	$in{"trans_$i"} =~ /^\d*$/ ||
 		&error(&text('servers_etrans', $in{"trans_$i"}));
 	local $s = { 'name' => 'server',