diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index 7156126ecf..d1ac83003d 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -1091,8 +1091,8 @@ function services_dhcpdv6_configure($blacklist = array()) {
 
 				$dhcpdv6cfg[$ifname]['prefixrange']['from'] = Net_IPv6::compress($range['start']);
 				$dhcpdv6cfg[$ifname]['prefixrange']['to'] = Net_IPv6::compress($range['end']);
-				$dhcpdv6cfg[$ifname]['dns6ip'] = get_interface_ipv6($ifname);
 			}
+			$dhcpdv6cfg[$ifname]['dns6ip'] = get_interface_ipv6($ifname);
 		}
 	}
 
@@ -1210,7 +1210,7 @@ EOD;
 			$dhcpdv6conf .= "	prefix6 {$dhcpv6ifconf['prefixrange']['from']} {$dhcpv6ifconf['prefixrange']['to']} /{$dhcpv6ifconf['prefixrange']['prefixlength']};\n";
 		}
 		if (is_ipaddrv6($dhcpv6ifconf['dns6ip'])) {
-			$dhcpdv6conf .= "       option dhcp6.name-servers {$dhcpv6ifconf['dns6ip']};\n";
+			$dhcpdv6conf .= "	option dhcp6.name-servers {$dhcpv6ifconf['dns6ip']};\n";
 		}
     		// default-lease-time
 		if ($dhcpv6ifconf['defaultleasetime'])