diff --git a/packages/mediacenter/xbmc-addon-settings/source/addon.xml b/packages/mediacenter/xbmc-addon-settings/source/addon.xml
index 59547746e0..8125c70016 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/addon.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="os.openelec.settings"
        name="OpenELEC OS Settings"
-       version="0.0.10"
+       version="0.0.12"
        provider-name="openelec.tv">
   <requires>
     <import addon="os.openelec.tv" version="@OS_VERSION@"/>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
index 75d35a3162..c53f57a16e 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
@@ -34,13 +34,13 @@
 		<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=""/>
-		<setting id="NET_DNS3" type="ipaddress" label="2136" 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_HIDDEN" type="bool" label="2152" default="false" /> -->
-		<setting id="NET_SECURITY" type="labelenum" label="2153" values="NONE|WPA/WPA2|WEP" sort="yes" default="NONE" />
+		<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)"/>
   </category>
 
@@ -49,20 +49,20 @@
 		<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"/>
+		<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=""/>
-		<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"/>
-		<setting id="NET2_GATEWAY" type="ipaddress" label="2133" default=""/>
-		<setting id="NET2_DNS1" type="ipaddress" label="2134" default=""/>
-		<setting id="NET2_DNS2" type="ipaddress" label="2135" default=""/>
-		<setting id="NET2_DNS3" type="ipaddress" label="2136" default=""/>
+		<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=""/>
+		<setting id="NET2_SSID" type="text" label="2151" default="" enable="!eq(-12,1)"/>
 <!-- 		<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" />
+		<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)"/>
   </category>