diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js
index 534b93a3..b8962396 100644
--- a/scripts/pi-hole/js/settings.js
+++ b/scripts/pi-hole/js/settings.js
@@ -114,6 +114,7 @@ function setConfigValues(topic, key, value) {
 
 function saveSettings() {
   var settings = {};
+  utils.disableAll();
   $("[data-key]").each(function () {
     var key = $(this).data("key");
     var value = $(this).val();
@@ -168,6 +169,7 @@ function saveSettings() {
     contentType: "application/json; charset=utf-8",
   })
     .done(function () {
+      utils.enableAll();
       // Success
       utils.showAlert(
         "success",
@@ -178,7 +180,10 @@ function saveSettings() {
       // Reload page
       location.reload();
     })
-    .fail(function (data) {
+    .fail(function (data, exception) {
+      utils.enableAll();
+      utils.showAlert("error", "", "Error while applying settings", data.responseText);
+      console.log(exception); // eslint-disable-line no-console
       apiFailure(data);
     });
 }
diff --git a/settings-dhcp.lp b/settings-dhcp.lp
index 5e5b0605..1c0bf7bf 100644
--- a/settings-dhcp.lp
+++ b/settings-dhcp.lp
@@ -32,7 +32,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
                     <div class="col-xs-12 col-sm-6 col-md-12 col-lg-6">
                         <div class="form-group">
                             <div class="input-group">
-                                <div class="input-group-addon">From</div>
+                                <div class="input-group-addon">Start</div>
                                 <input type="text" class="form-control DHCPgroup" id="dhcp.start" data-key="dhcp.start"
                                     autocomplete="off" spellcheck="false" autocapitalize="none"
                                     autocorrect="off" value="">
@@ -42,7 +42,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
                     <div class="col-xs-12 col-sm-6 col-md-12 col-lg-6">
                         <div class="form-group">
                             <div class="input-group">
-                                <div class="input-group-addon">To</div>
+                                <div class="input-group-addon">End</div>
                                 <input type="text" class="form-control DHCPgroup" id="dhcp.end" data-key="dhcp.end"
                                     autocomplete="off" spellcheck="false" autocapitalize="none"
                                     autocorrect="off" value="">
@@ -60,6 +60,17 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
                             </div>
                         </div>
                     </div>
+                    <div class="col-xs-12 col-sm-6 col-md-12 col-lg-6">
+                        <label>Netmask (<code>0.0.0.0</code> = auto)</label>
+                        <div class="form-group">
+                            <div class="input-group">
+                                <div class="input-group-addon">Netmask</div>
+                                <input type="text" class="form-control DHCPgroup" id="dhcp.netmask" data-key="dhcp.netmask"
+                                    autocomplete="off" spellcheck="false" autocapitalize="none"
+                                    autocorrect="off" value="">
+                            </div>
+                        </div>
+                    </div>
                     <div class="col-md-12">
                         <div><input type="checkbox" id="dhcp.ipv6" data-key="dhcp.ipv6" class="DHCPgroup">&nbsp;<label for="dhcp.ipv6"><strong>Enable additional IPv6 support (SLAAC + RA)</strong></label></div>
                         <p>Enable this option to enable IPv6 support for the Pi-hole DHCP server. This will allow the Pi-hole to hand out IPv6 addresses to clients and also provide IPv6 router advertisements (RA) to clients. This option is only useful if the Pi-hole is configured with an IPv6 address.</p>