diff --git a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml
index 60181b8f53..8bf4abbde6 100644
--- a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml
@@ -26,6 +26,9 @@
     <setting id="NET2_SECURITY" value="NONE" />
     <setting id="NET2_SSID" value="" />   
     <setting id="SAMBA_START" value="true" />
+    <setting id="SAMBA_SECURITY" value="false" />
+    <setting id="SAMBA_USERNAME" value="openelec" />
+    <setting id="SAMBA_PASSWORD" value="openelec" />
     <setting id="UPDATE_AUTO" value="manual" />
     <setting id="X11_KEYMAP" value="us" />
     <setting id="X11_KEYMAP2" value="" />
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
index 72c9edc799..b55f353595 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
@@ -36,5 +36,8 @@
 	<string id="5000">Samba</string>
 	<string id="5010">Boot</string>
 	<string id="5011">Start Samba at boot</string>
+	<string id="5012">Use Samba Passwords</string>
+	<string id="5013">Samba Username</string>
+	<string id="5014">Samba Password</string>
 
 </strings>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
index 3b223be4fb..f09078cb27 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
@@ -67,5 +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)"/>
     </category>
 </settings>