diff --git a/resources/lib/ConnectionManager.py b/resources/lib/ConnectionManager.py
index 2dd1a234..c469f2cb 100644
--- a/resources/lib/ConnectionManager.py
+++ b/resources/lib/ConnectionManager.py
@@ -122,13 +122,22 @@ class ConnectionManager():
         
         if(return_value > -1):
             selected_user = userList[return_value]
-            self.logMsg("Setting Selected User: %s" % selected_user)      
+            self.logMsg("Selected User: %s" % selected_user)      
             self.addon.setSetting("username", selected_user)
-            return
         else:
             xbmc.log("No user selected.")
             xbmc.executebuiltin('Addon.OpenSettings(%s)' % self.addonId)
             return
+
+        # Option to play from http
+        setPlayback = xbmcgui.Dialog().yesno("Playback option", "Play your files using HTTP?")
+        if setPlayback == 1:
+            self.logMsg("Playback will be set using HTTP/S.", 1)
+            addon.setSetting("playFromStream", "true")
+            return
+        else:
+            self.logMsg("Playback will be set using SMB.", 1)
+            return
                 
     def getServerDetails(self):
 
diff --git a/resources/settings.xml b/resources/settings.xml
index 1e9deee2..20fd540e 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -19,6 +19,7 @@
 	<category label="Playback"> <!-- Extra Sync options -->
 		<setting id="smbusername" type="text" label="30007" default="" visible="true" enable="true" />
 		<setting id="smbpassword" type="text" label="30008" default="" option="hidden" visible="true" enable="true" />
+		<setting id="playFromStream" type="bool" label="30002" visible="true" enable="true" value="false" />
 	    <setting id="autoPlaySeason" type="bool" label="30216" default="false" visible="true" enable="true" />
 	</category>
 	<category label="30022">