diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
index f9b0662d7b..cfac9bd349 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
@@ -27,17 +27,17 @@
 		<setting label="2130" type="lsep"/>
 		<setting type="sep" />
 		<setting id="NET_IPADDRESS" type="ipaddress" label="2131" default=""/>
-		<setting id="NET_PREFIXLEN" type="labelenum" label="2132" values="0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32" sort="yes" default="24"/>
-		<setting id="NET_GATEWAY" type="ipaddress" label="2133" default=""/>
-		<setting id="NET_DNS1" type="ipaddress" label="2134" default=""/>
-		<setting id="NET_DNS2" type="ipaddress" label="2135" default="" enable="!eq(-1,)"/>
-		<setting id="NET_DNS3" type="ipaddress" label="2136" default="" enable="!eq(-1,)"/>
-		<setting label="2150" type="lsep"/>
-		<setting type="sep" />
-		<setting id="NET_SSID" type="text" label="2151" default=""/>
+		<setting id="NET_PREFIXLEN" type="labelenum" label="2132" values="0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32" sort="yes" default="24" visible="!eq(-1,)"/>
+		<setting id="NET_GATEWAY" type="ipaddress" label="2133" default="" visible="!eq(-2,)"/>
+		<setting id="NET_DNS1" type="ipaddress" label="2134" default="" visible="!eq(-3,)"/>
+		<setting id="NET_DNS2" type="ipaddress" label="2135" default="" visible="!eq(-1,)"/>
+		<setting id="NET_DNS3" type="ipaddress" label="2136" default="" visible="!eq(-1,)"/>
+		<setting label="2150" type="lsep" visible="eq(-10,1)"/>
+		<setting type="sep" visible="eq(-11,1)"/>
+		<setting id="NET_SSID" type="text" label="2151" default="" visible="eq(-12,1)"/>
 <!-- 		<setting id="NET_HIDDEN" type="bool" label="2152" default="false" /> -->
-		<setting id="NET_SECURITY" type="labelenum" label="2153" values="NONE|WPA/WPA2|WEP" sort="yes" default="NONE" enable="!eq(-1,)"/>
-		<setting id="NET_PASSPHRASE" type="text" option="hidden" label="2154" default=""  enable="!eq(-1,0)"/>
+		<setting id="NET_SECURITY" type="labelenum" label="2153" values="NONE|WPA/WPA2|WEP" sort="yes" default="NONE" visible="!eq(-1,) + eq(-13,1)"/>
+		<setting id="NET_PASSPHRASE" type="text" option="hidden" label="2154" default=""  visible="!eq(-1,0) + !eq(-2,) + eq(-14,1)"/>
   </category>
 
    <!-- Network 2 -->
@@ -45,21 +45,21 @@
 		<setting label="2120" type="lsep"/>
 		<setting type="sep" />
 		<setting id="NET2_NETWORK" type="labelenum" label="2121" values="NONE|LAN|WLAN" sort="yes" default="NONE" />
-		<setting id="NET2_IFACE" type="labelenum" label="2122" values="eth0|eth1|wlan0|wlan1" sort="yes" default="eth1" enable="!eq(-1,1)"/>
-		<setting label="2130" type="lsep"/>
-		<setting type="sep" />
-		<setting id="NET2_IPADDRESS" type="ipaddress" label="2131" default="" enable="!eq(-4,1)"/>
-		<setting id="NET2_PREFIXLEN" type="labelenum" label="2132" values="0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32" sort="yes" default="24" enable="!eq(-5,1)"/>
-		<setting id="NET2_GATEWAY" type="ipaddress" label="2133" default="" enable="!eq(-6,1)"/>
-		<setting id="NET2_DNS1" type="ipaddress" label="2134" default="" enable="!eq(-7,1)"/>
-		<setting id="NET2_DNS2" type="ipaddress" label="2135" default="" enable="!eq(-1,)"/>
-		<setting id="NET2_DNS3" type="ipaddress" label="2136" default="" enable="!eq(-1,)"/>
-		<setting label="2150" type="lsep"/>
-		<setting type="sep" />
-		<setting id="NET2_SSID" type="text" label="2151" default="" enable="!eq(-12,1)"/>
+		<setting id="NET2_IFACE" type="labelenum" label="2122" values="eth0|eth1|wlan0|wlan1" sort="yes" default="eth1" visible="!eq(-1,1)"/>
+		<setting label="2130" type="lsep" visible="!eq(-2,1)"/>
+		<setting type="sep" visible="!eq(-3,1)"/>
+		<setting id="NET2_IPADDRESS" type="ipaddress" label="2131" default="" visible="!eq(-4,1)"/>
+		<setting id="NET2_PREFIXLEN" type="labelenum" label="2132" values="0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32" sort="yes" default="24" visible="!eq(-1,)"/>
+		<setting id="NET2_GATEWAY" type="ipaddress" label="2133" default="" visible="!eq(-2,)"/>
+		<setting id="NET2_DNS1" type="ipaddress" label="2134" default="" visible="!eq(-3,)"/>
+		<setting id="NET2_DNS2" type="ipaddress" label="2135" default="" visible="!eq(-1,)"/>
+		<setting id="NET2_DNS3" type="ipaddress" label="2136" default="" visible="!eq(-1,)"/>
+		<setting label="2150" type="lsep" visible="eq(-10,2)"/>
+		<setting type="sep" visible="eq(-11,2)"/>
+		<setting id="NET2_SSID" type="text" label="2151" default="" visible="eq(-12,2)"/>
 <!-- 		<setting id="NET2_HIDDEN" type="bool" label="2152" default="false" /> -->
-		<setting id="NET2_SECURITY" type="labelenum" label="2153" values="NONE|WPA/WPA2|WEP" sort="yes" default="NONE" enable="!eq(-1,)"/>
-		<setting id="NET2_PASSPHRASE" type="text" option="hidden" label="2154" default=""  enable="!eq(-1,0)"/>
+		<setting id="NET2_SECURITY" type="labelenum" label="2153" values="NONE|WPA/WPA2|WEP" sort="yes" default="NONE" visible="!eq(-1,) + eq(-13,2)"/>
+		<setting id="NET2_PASSPHRASE" type="text" option="hidden" label="2154" default=""  visible="!eq(-1,0) + !eq(-2,) + eq(-14,2)"/>
   </category>
 
    <!-- SAMBA -->
@@ -67,8 +67,8 @@
 		<setting label="5010" type="lsep"/>
 		<setting type="sep" />
 		<setting id="SAMBA_START" type="bool" label="5011" default="true" />
-		<setting id="SAMBA_SECURITY" type="bool" label="5012" default="false" enable="eq(-1,true)"/>
-		<setting id="SAMBA_USERNAME" type="text" label="5013" default="openelec" enable="eq(-1,true) + eq(-2,true)"/>
-		<setting id="SAMBA_PASSWORD" type="text" option="hidden" label="5014" default="openelec"  enable="eq(-2,true)+ eq(-3,true)"/>
+		<setting id="SAMBA_SECURITY" type="bool" label="5012" default="false" visible="eq(-1,true)"/>
+		<setting id="SAMBA_USERNAME" type="text" label="5013" default="openelec" visible="eq(-1,true) + eq(-2,true)"/>
+		<setting id="SAMBA_PASSWORD" type="text" option="hidden" label="5014" default="openelec"  visible="eq(-2,true)+ eq(-3,true)"/>
     </category>
 </settings>