diff --git a/templates/dhcp.php b/templates/dhcp.php
index 6fe48917..921bbbf0 100755
--- a/templates/dhcp.php
+++ b/templates/dhcp.php
@@ -29,7 +29,7 @@
 
       <div class="card-body">
         <?php $status->showMessages(); ?>
-        <form method="POST" action="dhcpd_conf" class="js-dhcp-settings-form">
+        <form method="POST" action="dhcpd_conf" class="js-dhcp-settings-form needs-validation" novalidate>
           <?php echo CSRFTokenFieldTag() ?>
 
           <!-- Nav tabs -->
diff --git a/templates/dhcp/general.php b/templates/dhcp/general.php
index 5f257c02..84c8928f 100644
--- a/templates/dhcp/general.php
+++ b/templates/dhcp/general.php
@@ -35,9 +35,12 @@
 
   <h5 class="mt-1">Static IP options</h5>
   <div class="row">
-    <div class="form-group col-md-6">
+    <div class="form-group col-md-6" required>
       <label for="code"><?php echo _("IP Address"); ?></label>
       <input type="text" class="form-control" id="txtipaddress" name="StaticIP" />
+      <div class="invalid-feedback">
+        <?php echo _("Please provide a valid IP Address."); ?>
+      </div>
     </div>
   </div>
 
@@ -45,6 +48,9 @@
     <div class="form-group col-md-6">
       <label for="code"><?php echo _("Subnet Mask"); ?></label>
       <input type="text" class="form-control" id="txtsubnetmask" name="SubnetMask" />
+      <div class="invalid-feedback">
+        <?php echo _("Please provide a valid Subnet mask."); ?>
+      </div>
     </div>
   </div>
 
@@ -52,6 +58,9 @@
     <div class="form-group col-md-6">
       <label for="code"><?php echo _("Default gateway"); ?></label>
       <input type="text" class="form-control" id="txtgateway" name="DefaultGateway" />
+      <div class="invalid-feedback">
+        <?php echo _("Please provide a valid Default gateway."); ?>
+      </div>
     </div>
   </div>
 
@@ -99,6 +108,9 @@
     <div class="form-group col-md-6">
       <label for="code"><?php echo _("Starting IP Address"); ?></label>
       <input type="text" class="form-control" id="txtrangestart" name="RangeStart" />
+      <div class="invalid-feedback">
+        <?php echo _("Please provide a valid Starting IP Address."); ?>
+      </div>
     </div>
   </div>
 
@@ -106,6 +118,9 @@
     <div class="form-group col-md-6">
       <label for="code"><?php echo _("Ending IP Address"); ?></label>
       <input type="text" class="form-control" id="txtrangeend" name="RangeEnd" />
+      <div class="invalid-feedback">
+        <?php echo _("Please provide a valid Ending IP Address."); ?>
+      </div>
     </div>
   </div>
 
@@ -113,6 +128,9 @@
     <div class="form-group col-xs-3 col-sm-3">
       <label for="code"><?php echo _("Lease Time"); ?></label>
       <input type="text" class="form-control" id="txtrangeleasetime" name="RangeLeaseTime" />
+      <div class="invalid-feedback">
+        <?php echo _("Please provide a valid Lease Time."); ?>
+      </div>
     </div>
     <div class="col-xs-3 col-sm-3">
       <label for="code"><?php echo _("Interval"); ?></label>
@@ -122,6 +140,9 @@
         <option value="d"><?php echo _("Day(s)"); ?></option>
         <option value="i"><?php echo _("Infinite"); ?></option>
       </select>
+      <div class="invalid-feedback">
+        <?php echo _("Please provide a valid Interval."); ?>
+      </div>
     </div>
   </div>
 
diff --git a/templates/hostapd.php b/templates/hostapd.php
index ce3dea1a..e888a709 100755
--- a/templates/hostapd.php
+++ b/templates/hostapd.php
@@ -49,7 +49,7 @@
 
       <div class="card-body">
         <?php $status->showMessages(); ?>
-        <form role="form" action="hostapd_conf" method="POST">
+        <form role="form" action="hostapd_conf" method="POST" class="needs-validation" novalidate>
           <?php echo CSRFTokenFieldTag() ?>
 
           <!-- Nav tabs -->
diff --git a/templates/hostapd/basic.php b/templates/hostapd/basic.php
index 6fbda270..6ae6170c 100644
--- a/templates/hostapd/basic.php
+++ b/templates/hostapd/basic.php
@@ -7,9 +7,12 @@
     </div>
   </div>
   <div class="row">
-    <div class="form-group col-md-6">
+    <div class="form-group col-md-6" required>
       <label for="txtssid"><?php echo _("SSID"); ?></label>
-      <input type="text" id="txtssid" class="form-control" name="ssid" value="<?php echo htmlspecialchars($arrConfig['ssid'], ENT_QUOTES); ?>" />
+      <input type="text" id="txtssid" class="form-control" name="ssid" value="<?php echo htmlspecialchars($arrConfig['ssid'], ENT_QUOTES); ?>" required />
+      <div class="invalid-feedback">
+        <?php echo _("Please provide a valid SSID."); ?>
+      </div>
     </div>
   </div>
   <div class="row">
diff --git a/templates/hostapd/security.php b/templates/hostapd/security.php
index 7389ee41..3870c26e 100644
--- a/templates/hostapd/security.php
+++ b/templates/hostapd/security.php
@@ -12,10 +12,13 @@
       </div>
       <label for="txtwpapassphrase"><?php echo _("PSK"); ?></label>
       <div class="input-group">
-        <input type="text" class="form-control" id="txtwpapassphrase" name="wpa_passphrase" value="<?php echo htmlspecialchars($arrConfig['wpa_passphrase'], ENT_QUOTES); ?>" />
+        <input type="text" class="form-control" id="txtwpapassphrase" name="wpa_passphrase" value="<?php echo htmlspecialchars($arrConfig['wpa_passphrase'], ENT_QUOTES); ?>" required />
         <div class="input-group-append">
           <button class="btn btn-outline-secondary" type="button" id="gen_wpa_passphrase"><i class="fas fa-magic"></i></button>
         </div>
+        <div class="invalid-feedback">
+          <?php echo _("Please provide a valid PSK."); ?>
+        </div>
       </div>
     </div>
     <div class="col-md-6">