diff --git a/resources/lib/ConnectionManager.py b/resources/lib/ConnectionManager.py
index 2dd1a234..b46e0075 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("elected 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.", 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..d23bbb80 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -3,11 +3,11 @@
 	<category label="30014"> <!-- Emby -->
 		<setting id="ipaddress" type="text" label="30000" default="" visible="true" enable="true" />
 		<setting id="port" type="text" label="30030" default="8096" visible="true" enable="true" />
+		<setting id="username" type="text" label="30024" />
 		<setting id="https" type="bool" label="30243" visible="true" enable="true" default="false" />
 		<setting type="sep" />
-		<setting id="username" type="text" label="30024" />
-		<setting type="sep" />
 		<setting id="deviceName" type="text" label="30016" default="Kodi" />
+		<setting id="playFromStream" type="bool" label="30002" visible="true" enable="true" default="false" />
 	</category>
 	<!-- <category label="Manual sync"> <setting label="Run manual full sync now" type="action" action="RunScript(plugin.video.mbsync, fullsync)" /> <setting label="Run manual incremental sync now" type="action" action="RunScript(plugin.video.mbsync, incrementalsync)" /> <setting label="Reset entire local library" type="action" action="RunScript(plugin.video.mbsync, reset)" /> </category> -->
 	<category label="Sync Options">