diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
index d9aadbce..70ac8ea4 100644
--- a/scripts/pi-hole/php/savesettings.php
+++ b/scripts/pi-hole/php/savesettings.php
@@ -6,7 +6,7 @@ if(basename($_SERVER['SCRIPT_FILENAME']) !== "settings.php")
 }
 
 function validIP($address){
-	return !filter_var($address, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === false;
+	return !filter_var($address, FILTER_VALIDATE_IP) === false;
 }
 
 // Check for existance of variable
@@ -61,9 +61,13 @@ function validDomain($domain_name)
 				$secondaryDNS = $_POST["secondaryDNS"];
 
 				// Get primary DNS server IP address
-				if($primaryDNS === "Custom")
+				if($primaryDNS === "Customv4")
 				{
-					$primaryIP = $_POST["DNS1IP"];
+					$primaryIP = $_POST["DNS1IPv4"];
+				}
+				elseif($primaryDNS === "Customv6")
+				{
+					$primaryIP = $_POST["DNS1IPv6"];
 				}
 				else
 				{
@@ -77,11 +81,22 @@ function validDomain($domain_name)
 				}
 
 				// Get secondary DNS server IP address
-				if($secondaryDNS === "Custom")
+				if($secondaryDNS === "Customv4")
 				{
-					if(strlen($_POST["DNS2IP"]) > 0)
+					if(strlen($_POST["DNS2IPv4"]) > 0)
 					{
-						$secondaryIP = $_POST["DNS2IP"];
+						$secondaryIP = $_POST["DNS2IPv4"];
+					}
+					else
+					{
+						$secondaryIP = "none";
+					}
+				}
+				elseif($secondaryDNS === "Customv6")
+				{
+					if(strlen($_POST["DNS2IPv6"]) > 0)
+					{
+						$secondaryIP = $_POST["DNS2IPv6"];
 					}
 					else
 					{
diff --git a/settings.php b/settings.php
index d53e5b5d..d538a5f3 100644
--- a/settings.php
+++ b/settings.php
@@ -453,14 +453,14 @@
 						<?php foreach ($primaryDNSservers as $key => $value) { ?> <div class="radio"><label><input type="radio" name="primaryDNS" value="<?php echo $value;?>" <?php if($piHoleDNS1 === $value){ ?>checked<?php } ?> ><?php echo $value;?> (<?php echo $key;?>)</label></div> <?php } ?>
 						<label>Custom (IPv4)</label>
 						<div class="input-group">
-							<div class="input-group-addon"><input type="radio" name="primaryDNS" value="Custom"
-							<?php if($piHoleDNS1 === "Custom"){ ?>checked<?php } ?>></div>
+							<div class="input-group-addon"><input type="radio" name="primaryDNS" value="Customv4"
+							<?php if($piHoleDNS1 === "Customv4"){ ?>checked<?php } ?>></div>
 							<input type="text" name="DNS1IPv4" class="form-control" id="DNS1IPv4" <?php if($piHoleDNS1 === "Customv4"){ ?>value="<?php echo $setupVars["PIHOLE_DNS_1"]; ?>"<?php } ?>>
 						</div>
 						<label>Custom (IPv6)</label>
 						<div class="input-group">
-							<div class="input-group-addon"><input type="radio" name="primaryDNS" value="Custom"
-							<?php if($piHoleDNS1 === "Custom"){ ?>checked<?php } ?>></div>
+							<div class="input-group-addon"><input type="radio" name="primaryDNS" value="Customv6"
+							<?php if($piHoleDNS1 === "Customv6"){ ?>checked<?php } ?>></div>
 							<input type="text" name="DNS1IPv6" class="form-control" id="DNS1IPv6" <?php if($piHoleDNS1 === "Customv6"){ ?>value="<?php echo $setupVars["PIHOLE_DNS_1"]; ?>"<?php } ?>>
 						</div>
 					</div>
@@ -471,15 +471,15 @@
 						<?php foreach ($secondaryDNSservers as $key => $value) { ?> <div class="radio"><label><input type="radio" name="secondaryDNS" value="<?php echo $value;?>" <?php if($piHoleDNS2 === $value){ ?>checked<?php } ?> ><?php echo $value;?> (<?php echo $key;?>)</label></div> <?php } ?>
 						<label>Custom (IPv4)</label>
 						<div class="input-group">
-							<div class="input-group-addon"><input type="radio" name="secondaryDNS" value="Custom"
-							<?php if($piHoleDNS2 === "Custom"){ ?>checked<?php } ?>></div>
+							<div class="input-group-addon"><input type="radio" name="secondaryDNS" value="Customv4"
+							<?php if($piHoleDNS2 === "Customv4"){ ?>checked<?php } ?>></div>
 							<input type="text" name="DNS2IPv4" class="form-control" id="DNS2IPv4" <?php if($piHoleDNS2 === "Customv4"){ ?>value="<?php echo $setupVars["PIHOLE_DNS_2"]; ?>"<?php } ?>>
 						</div>
 						<label>Custom (IPv6)</label>
 						<div class="input-group">
-							<div class="input-group-addon"><input type="radio" name="secondaryDNS" value="Custom"
+							<div class="input-group-addon"><input type="radio" name="secondaryDNS" value="Customv6"
 							<?php if($piHoleDNS2 === "Customv6"){ ?>checked<?php } ?>></div>
-							<input type="text" name="DNS2IPv6" class="form-control" id="DNS2IPv6" <?php if($piHoleDNS2 === "Custom"){ ?>value="<?php echo $setupVars["PIHOLE_DNS_2"]; ?>"<?php } ?>>
+							<input type="text" name="DNS2IPv6" class="form-control" id="DNS2IPv6" <?php if($piHoleDNS2 === "Customv6"){ ?>value="<?php echo $setupVars["PIHOLE_DNS_2"]; ?>"<?php } ?>>
 						</div>
 					</div>
 				</div>