diff --git a/app/js/custom.js b/app/js/custom.js
index 09b6176f..10ab8b6c 100644
--- a/app/js/custom.js
+++ b/app/js/custom.js
@@ -365,7 +365,9 @@ function loadChannelSelect(selected) {
         var countries_5Ghz_max48ch = data["5Ghz_max48ch"].countries;
 
         // Map selected hw_mode and country to determine channel list
-        if (($.inArray(country_code, countries_2_4Ghz_max11ch) !== -1) && (hw_mode !== 'ac') ) {
+        if (hw_mode === 'a') {
+            selectablechannels = data["5Ghz_max48ch"].channels;
+        } else if (($.inArray(country_code, countries_2_4Ghz_max11ch) !== -1) && (hw_mode !== 'ac') ) {
             selectablechannels = data["2_4GHz_max11ch"].channels;
         } else if (($.inArray(country_code, countries_2_4Ghz_max14ch) !== -1) && (hw_mode === 'b')) {
             selectablechannels = data["2_4GHz_max14ch"].channels;
@@ -477,19 +479,6 @@ $(document).on("click", ".js-toggle-password", function(e) {
     }
 });
 
-$(document).on("keyup", ".js-validate-psk", function(e) {
-    var field  = $(e.target);
-    var colors = field.data("colors").split(",");
-    var target = $(field.data("target"));
-    if (field.val().length < 8 || field.val().length > 63) {
-        field.css("backgroundColor", colors[0]);
-        target.attr("disabled", true);
-    } else {
-        field.css("backgroundColor", colors[1]);
-        target.attr("disabled", false);
-    }
-});
-
 $(function() {
     $('#theme-select').change(function() {
         var theme = themes[$( "#theme-select" ).val() ]; 
diff --git a/templates/wifi_stations/network.php b/templates/wifi_stations/network.php
index e0a9684c..abac081a 100644
--- a/templates/wifi_stations/network.php
+++ b/templates/wifi_stations/network.php
@@ -62,7 +62,7 @@
 				<?php if ($network['protocol'] === 'Open') { ?>
 					<input type="password" disabled class="form-control" aria-describedby="passphrase" name="passphrase<?php echo $index ?>" value="" />
 				<?php } else { ?>
-					<input type="password" class="form-control js-validate-psk" aria-describedby="passphrase" name="passphrase<?php echo $index ?>" value="<?php echo $network['passphrase'] ?>" data-target="#update<?php echo $index ?>" data-colors="#ffd0d0,#d0ffd0">
+					<input type="password" class="form-control" aria-describedby="passphrase" name="passphrase<?php echo $index ?>" value="<?php echo $network['passphrase'] ?>" data-target="#update<?php echo $index ?>" data-colors="#ffd0d0,#d0ffd0">
 					<div class="input-group-append">
 						<button class="btn btn-outline-secondary js-toggle-password" type="button" data-target="[name=passphrase<?php echo $index ?>]" data-toggle-with="<?php echo _("Hide") ?>">Show</button>
 					</div>
@@ -75,7 +75,7 @@
 				<input type="submit" class="col-xs-4 col-md-4 btn btn-warning" value="<?php echo _("Update"); ?>" id="update<?php echo $index ?>" name="update<?php echo $index ?>"<?php echo ($network['protocol'] === 'Open' ? ' disabled' : '')?> data-toggle="modal" data-target="#configureClientModal" />
 				<button type="submit" class="col-xs-4 col-md-4 btn btn-info" value="<?php echo $index?>" name="connect"><?php echo _("Connect"); ?></button>
 			<?php } else { ?>
-				<input type="submit" class="col-xs-4 col-md-4 btn btn-info" value="<?php echo _("Add"); ?>" id="update<?php echo $index ?>" name="update<?php echo $index ?>" <?php echo ($network['protocol'] === 'Open' ? '' : ' disabled')?> data-toggle="modal" data-target="#configureClientModal" />
+				<input type="submit" class="col-xs-4 col-md-4 btn btn-info" value="<?php echo _("Add"); ?>" id="update<?php echo $index ?>" name="update<?php echo $index ?>" data-toggle="modal" data-target="#configureClientModal" />
 			<?php } ?>
 			<input type="submit" class="col-xs-4 col-md-4 btn btn-danger" value="<?php echo _("Delete"); ?>" name="delete<?php echo $index ?>"<?php echo ($network['configured'] ? '' : ' disabled')?> data-toggle="modal" data-target="#configureClientModal" />
 		</div><!-- /.btn-group -->