diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
index 6d8a77b8..e58cf1dc 100644
--- a/scripts/pi-hole/php/savesettings.php
+++ b/scripts/pi-hole/php/savesettings.php
@@ -123,7 +123,9 @@ function isinserverlist($addr) {
 			"Norton" => ["v4_1" => "199.85.126.10", "v4_2" => "199.85.127.10"],
 			"Comodo" => ["v4_1" => "8.26.56.26", "v4_2" => "8.20.247.20"],
 			"DNS.WATCH" => ["v4_1" => "84.200.69.80", "v4_2" => "84.200.70.40", "v6_1" => "2001:1608:10:25:0:0:1c04:b12f", "v6_2" => "2001:1608:10:25:0:0:9249:d69b"],
-			"Quad9" => ["v4_1" => "9.9.9.9", "v4_2" => "149.112.112.112", "v6_1" => "2620:fe::fe"],
+			"Quad9 (filtered, DNSSEC)" => ["v4_1" => "9.9.9.9", "v4_2" => "149.112.112.112", "v6_1" => "2620:fe::fe"],
+			"Quad9 (unfiltered, no DNSSEC)" => ["v4_1" => "9.9.9.10", "v4_2" => "149.112.112.10", "v6_1" => "2620:fe::10"],
+			"Quad9 (filtered + ECS)" => ["v4_1" => "9.9.9.11", "v4_2" => "149.112.112.11", "v6_1" => "2620:fe::11"],
 			"Cloudflare" => ["v4_1" => "1.1.1.1", "v4_2" => "1.0.0.1", "v6_1" => "2606:4700:4700::1111", "v6_2" => "2606:4700:4700::1001"]
 		];
 
diff --git a/settings.php b/settings.php
index 3e2a676d..231ad286 100644
--- a/settings.php
+++ b/settings.php
@@ -317,14 +317,14 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                         if (isset($setupVars["DHCP_END"])) {
                             $DHCPend = $setupVars["DHCP_END"];
                         } else {
-                            $DHCPend = ""; 
+                            $DHCPend = "";
                         }
                         if (isset($setupVars["DHCP_ROUTER"])) {
                             $DHCProuter = $setupVars["DHCP_ROUTER"];
                         } else {
                             $DHCProuter = "";
                         }
-                        
+
                         // This setting has been added later, we have to check if it exists
                         if (isset($setupVars["DHCP_LEASETIME"])) {
                             $DHCPleasetime = $setupVars["DHCP_LEASETIME"];
@@ -651,7 +651,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                     </div>
                                     <div class="box-body">
                                         <div class="row">
-                                            <div class="col-sm-6">
+                                            <div class="col-sm-12">
                                                 <table class="table table-bordered">
                                                     <tr>
                                                         <th colspan="2">IPv4</th>
@@ -699,8 +699,18 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                                     <?php } ?>
                                                 </table>
                                             </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-lg-6">
+                                <div class="box box-warning">
+                                    <div class="box-header with-border">
+                                        <h1 class="box-title">Upstream DNS Servers</h1>
+                                    </div>
+                                    <div class="box-body">
+                                        <div class="row">
                                             <div class="col-sm-6">
-                                                <label>&nbsp;</label>
                                                 <div class="form-group">
                                                     <label>Custom 1 (IPv4)</label>
                                                     <div class="input-group">
@@ -720,6 +730,10 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                                         <input type="text" name="custom2val" class="form-control"
                                                                <?php if (isset($custom2)){ ?>value="<?php echo $custom2; ?>"<?php } ?>>
                                                     </div>
+                                                </div>
+                                            </div>
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
                                                     <label>Custom 3 (IPv6)</label>
                                                     <div class="input-group">
                                                         <div class="input-group-addon">