diff --git a/templates/hostapd/security.php b/templates/hostapd/security.php
index 4da80a38..f271dfc5 100644
--- a/templates/hostapd/security.php
+++ b/templates/hostapd/security.php
@@ -11,11 +11,9 @@
         <?php SelectorOptions('wpa_pairwise', $arrEncType, $arrConfig['wpa_pairwise'], 'cbxwpapairwise'); ?>
       </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); ?>" 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="input-group has-validation">
+        <input type="text" class="form-control" id="txtwpapassphrase" name="wpa_passphrase" value="<?php echo htmlspecialchars($arrConfig['wpa_passphrase'], ENT_QUOTES); ?>" aria-describedby="gen_wpa_passphrase" required />
+        <div class="input-group-text" id="gen_wpa_passphrase"><i class="fas fa-magic"></i></div>
         <div class="invalid-feedback">
           <?php echo _("Please provide a valid PSK."); ?>
         </div>