diff --git a/app/js/custom.js b/app/js/custom.js
index 76247d11..1923b38d 100644
--- a/app/js/custom.js
+++ b/app/js/custom.js
@@ -143,6 +143,16 @@ $(document).on("submit", ".js-dhcp-settings-form", function(e) {
     $(".js-add-dhcp-static-lease").trigger("click");
 });
 
+$(document).on("click", "#gen_wpa_passphrase", function(e) {
+    $('#txtwpapassphrase').val(genPassword(63));
+});
+
+function genPassword(pwdLen) {
+    var pwdChars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+    var rndPass = Array(pwdLen).fill(pwdChars).map(function(x) { return x[Math.floor(Math.random() * x.length)] }).join('');
+    return rndPass;
+}
+
 function setupBtns() {
     $('#btnSummaryRefresh').click(function(){getAllInterfaces();});
     $('.intsave').click(function(){
diff --git a/templates/hostapd.php b/templates/hostapd.php
index 79e2f106..8e8bdeee 100755
--- a/templates/hostapd.php
+++ b/templates/hostapd.php
@@ -91,9 +91,12 @@
                   <label for="cbxwpapairwise"><?php echo _("Encryption Type"); ?></label>
                   <?php SelectorOptions('wpa_pairwise', $arrEncType, $arrConfig['wpa_pairwise'], 'cbxwpapairwise'); ?>
                 </div>
-                <div class="form-group">
-                  <label for="txtwpapassphrase"><?php echo _("PSK"); ?></label>
+                <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); ?>" />
+                  <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>
               </div>
               <div class="col-md-6">