diff --git a/emhttp/plugins/dynamix/include/Wireless.php b/emhttp/plugins/dynamix/include/Wireless.php
index 290ad2125..43d6b1061 100644
--- a/emhttp/plugins/dynamix/include/Wireless.php
+++ b/emhttp/plugins/dynamix/include/Wireless.php
@@ -199,35 +199,35 @@ case 'join':
     echo mk_option($safe, 'IEEE 802.1X/SHA-256', _('WPA3 Enterprise'));
     echo "</select></td></tr>";
   }
-  if ($ieee1 || $manual || $safe) echo "<tr id=\"username\" class=\"$hide0\"><td>"._('Username').":</td><td><input type=\"text\" name=\"USERNAME\" class=\"narrow\" maxlength=\"63\" value=\"$user\"></td></tr>";
-  if ($attr3 || $manual || $safe) echo "<tr id=\"password\" class=\"$hide1\"><td>"._('Password').":</td><td><input type=\"password\" name=\"PASSWORD\" class=\"narrow\" maxlength=\"63\" value=\"$passwd\"><i id=\"showPass\" class=\"fa fa-eye\" onclick=\"showPassword()\"></i></td></tr>";
+  if ($ieee1 || $manual || $safe) echo "<tr id=\"username\" class=\"$hide0\"><td>"._('Username').":</td><td><input type=\"text\" name=\"USERNAME\" class=\"narrow swal-input-show\" maxlength=\"63\" value=\"$user\"></td></tr>";
+  if ($attr3 || $manual || $safe) echo "<tr id=\"password\" class=\"$hide1\"><td>"._('Password').":</td><td><input type=\"password\" name=\"PASSWORD\" class=\"narrow swal-input-show\" maxlength=\"63\" value=\"$passwd\"><i id=\"showPass\" class=\"fa fa-eye\" onclick=\"showPassword()\"></i></td></tr>";
   echo "<tr><td colspan=\"2\">&nbsp;</td></tr>";
   echo "<tr><td>"._('IPv4 address assignment').":</td><td><select name=\"DHCP4\" onclick=\"showDHCP(this.value,4)\">";
   echo mk_option($dhcp4, 'yes', _('Automatic'));
   echo mk_option($dhcp4, 'no', _('Static'));
   echo "</select></td></tr>";
-  echo "<tr class=\"static4 $hide2\"><td>"._('IPv4 address').":</td><td><input type=\"text\" name=\"IP4\" class=\"narrow\" maxlength=\"15\" value=\"$ip4\">/<select name=\"MASK4\" class=\"slim\">";
+  echo "<tr class=\"static4 $hide2\"><td>"._('IPv4 address').":</td><td><input type=\"text\" name=\"IP4\" class=\"narrow swal-input-show\" maxlength=\"15\" value=\"$ip4\">/<select name=\"MASK4\" class=\"slim\">";
   foreach ($masks as $mask => $prefix) echo mk_option($mask4, $mask, $prefix);
   echo "</select></td></tr>";
-  echo "<tr class=\"static4 $hide2\"><td>"._('IPv4 default gateway').":</td><td><input type=\"text\" name=\"GATEWAY4\" class=\"narrow\" maxlength=\"15\" value=\"$gw4\"></td></tr>";
+  echo "<tr class=\"static4 $hide2\"><td>"._('IPv4 default gateway').":</td><td><input type=\"text\" name=\"GATEWAY4\" class=\"narrow swal-input-show\" maxlength=\"15\" value=\"$gw4\"></td></tr>";
   echo "<tr class=\"dns4\"><td>"._('IPv4 DNS assignment').":</td><td><select name=\"DNS4\" onclick=\"showDNS(this.value,4)\">";
   echo mk_option($dns4, "no", _("Automatic"));
   echo mk_option($dns4, "yes", _("Static"));
   echo "</select></td></tr>";
-  echo "<tr class=\"server4 $hide3\"><td>"._('DNSv4 server').":</td><td><input type=\"text\" name=\"SERVER4\" class=\"narrow\" value=\"$server4\"></td></tr>";
+  echo "<tr class=\"server4 $hide3\"><td>"._('DNSv4 server').":</td><td><input type=\"text\" name=\"SERVER4\" class=\"narrow swal-input-show\" value=\"$server4\"></td></tr>";
   echo "<tr><td colspan=\"2\">&nbsp;</td></tr>";
   echo "<tr><td>"._('IPv6 address assignment').":</td><td><select name=\"DHCP6\" onclick=\"showDHCP(this.value,6)\">";
   echo mk_option($dhcp6, '', _('None'));
   echo mk_option($dhcp6, 'yes', _('Automatic'));
   echo mk_option($dhcp6, 'no', _('Static'));
   echo "</select></td></tr>";
-  echo "<tr class=\"static6 $hide4\"><td>"._('IPv6 address').":</td><td><input type=\"text\" name=\"IP6\" class=\"narrow\" maxlength=\"39\" value=\"$ip6\">/<input type=\"number\" min=\"1\" max=\"128\" maxlength=\"3\" name=\"MASK6\" class=\"slim\" value=\"$mask6\"></td></tr>";
-  echo "<tr class=\"static6 $hide4\"><td>"._('IPv6 default gateway').":</td><td><input type=\"text\" name=\"GATEWAY6\" class=\"narrow\" maxlength=\"39\" value=\"$gw6\"></td></tr>";
+  echo "<tr class=\"static6 $hide4\"><td>"._('IPv6 address').":</td><td><input type=\"text\" name=\"IP6\" class=\"narrow swal-input-show\" maxlength=\"39\" value=\"$ip6\">/<input type=\"number\" min=\"1\" max=\"128\" maxlength=\"3\" name=\"MASK6\" class=\"slim\" value=\"$mask6\"></td></tr>";
+  echo "<tr class=\"static6 $hide4\"><td>"._('IPv6 default gateway').":</td><td><input type=\"text\" name=\"GATEWAY6\" class=\"narrow swal-input-show\" maxlength=\"39\" value=\"$gw6\"></td></tr>";
   echo "<tr class=\"dns6 $hide5\"><td>"._('IPv6 DNS assignment').":</td><td><select name=\"DNS6\" onclick=\"showDNS(this.value,6)\">";
   echo mk_option($dns6, "no", _("Automatic"));
   echo mk_option($dns6, "yes", _("Static"));
   echo "</select></td></tr>";
-  echo "<tr class=\"server6 $hide6\"><td>"._('DNSv6 server').":</td><td><input type=\"text\" name=\"SERVER6\" class=\"narrow\" value=\"$server6\"></td></tr>";
+  echo "<tr class=\"server6 $hide6\"><td>"._('DNSv6 server').":</td><td><input type=\"text\" name=\"SERVER6\" class=\"narrow swal-input-show\" value=\"$server6\"></td></tr>";
   echo "<tr><td colspan=\"2\">&nbsp;</td></tr>";
   echo "</table>";
   echo "</form>";
diff --git a/emhttp/plugins/dynamix/styles/jquery.sweetalert.css b/emhttp/plugins/dynamix/styles/jquery.sweetalert.css
index 8448e3d1f..44cbe4f53 100644
--- a/emhttp/plugins/dynamix/styles/jquery.sweetalert.css
+++ b/emhttp/plugins/dynamix/styles/jquery.sweetalert.css
@@ -178,18 +178,9 @@ pre#swaltext {
     }
   }
 
-  input[type=text] {
-    width: 100%;
-    box-sizing: border-box;
-    border-radius: 3px;
-    border: 1px solid #d7d7d7;
-    margin-top: 2rem;
-    font-size: 1.8rem;
-    box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.06);
-    padding: 1rem;
+  /* this is a hack to prevent the default SWAL input from being shown, but allow the ones we want to be show */
+  input[type="text"]:not(.swal-input-show) {
     display: none;
-    -webkit-transition: all 0.3s;
-    transition: all 0.3s;
   }
 
   input:focus {
@@ -608,43 +599,6 @@ pre#swaltext {
   transform: scale(1);
 }
 
-.sweet-alert input[type=text] {
-  width: 100%;
-  box-sizing: border-box;
-  border-radius: 3px;
-  border: 1px solid #d7d7d7;
-  margin-top: 2rem;
-  font-size: 1.8rem;
-  box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.06);
-  padding: 1rem;
-  display: none;
-  -webkit-transition: all 0.3s;
-  transition: all 0.3s;
-}
-
-.sweet-alert input:focus {
-  outline: none;
-  box-shadow: 0px 0px 3px #c4e6f5;
-  border: 1px solid #b4dbed;
-}
-
-.sweet-alert input:focus::-moz-placeholder,
-.sweet-alert input:focus:-ms-input-placeholder,
-.sweet-alert input:focus::-webkit-input-placeholder {
-  transition: opacity 0.3s 0.03s ease;
-  opacity: 0.5;
-}
-
-.sweet-alert input::-moz-placeholder,
-.sweet-alert input:-ms-input-placeholder,
-.sweet-alert input::-webkit-input-placeholder {
-  color: #bdbdbd;
-}
-
-.sweet-alert.show-input input {
-  display: block;
-}
-
 /* Buttons */
 .sa-button-container {
   margin-top: 2rem;