diff --git a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/TabWirelessUi.java b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/TabWirelessUi.java
index 9310993..439ae25 100644
--- a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/TabWirelessUi.java
+++ b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/TabWirelessUi.java
@@ -1794,7 +1794,7 @@ private void updateChannelListValues(List<GwtWifiChannelFrequency> freqChannels)
         if (this.activeConfig != null && this.activeConfig.getChannels() != null
                 && !this.activeConfig.getChannels().isEmpty()) {
             this.netTabs.hardwareTab.channel
-                    .setText(this.channelList.getItemText(this.activeConfig.getChannels().get(0)));
+                    .setText(this.channelList.getItemText(selectedChannelValue));
 
             this.channelList.setSelectedIndex(selectedChannelValue);
         }
diff --git a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/validator/GwtValidators.java b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/validator/GwtValidators.java
index 8e6893e..0e35cac 100644
--- a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/validator/GwtValidators.java
+++ b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/validator/GwtValidators.java
@@ -53,9 +53,9 @@ public static List<Validator<String>> newPassword(final Optional<String> identit
 
         final List<Validator<String>> defaultValidators = new ArrayList<>();
         
+        defaultValidators.add(nonEmpty(MSGS.pwdEmpty()));
         defaultValidators.add(stringLength(255, MSGS.pwdMaxLength()));
         defaultValidators.add(noWhitespaceCharacters(MSGS.pwdWhitespaceCharacters()));
-        defaultValidators.add(nonEmpty(MSGS.pwdEmpty()));
 
         identityName.ifPresent(
                 id -> defaultValidators.add(notEqualsIdentityName(id, MSGS.pwdStrengthNotEqualsIdentityName())));
diff --git a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/model/GwtWifiNetInterfaceConfig.java b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/model/GwtWifiNetInterfaceConfig.java
index f036564..5a8b901 100644
--- a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/model/GwtWifiNetInterfaceConfig.java
+++ b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/model/GwtWifiNetInterfaceConfig.java
@@ -110,7 +110,8 @@ public void setWifiConfig(GwtWifiConfig wifiConfig) {
 
     public GwtWifiConfig getActiveWifiConfig() {
         GwtWifiWirelessMode wifiMode = getWirelessModeEnum();
-        GwtWifiConfig activeConfig = null;
+        GwtWifiConfig activeConfig = new GwtWifiConfig();
+        activeConfig.setWirelessMode(wifiMode.name());
 
         if (wifiMode.equals(GwtWifiWirelessMode.netWifiWirelessModeAccessPoint)) {
             activeConfig = this.m_accessPointWifiConfig;