diff --git a/resources/lib/functions.py b/resources/lib/functions.py
index a1ce28d..f876026 100644
--- a/resources/lib/functions.py
+++ b/resources/lib/functions.py
@@ -1290,6 +1290,7 @@ def getWigetContent(pluginName, handle, params):
     if(result == None):
         result = []   
 
+    image = ""
     itemCount = 1
     listItems = []
     for item in result:
diff --git a/resources/lib/server_detect.py b/resources/lib/server_detect.py
index 3202d25..4d23977 100644
--- a/resources/lib/server_detect.py
+++ b/resources/lib/server_detect.py
@@ -117,9 +117,6 @@ def checkServer(force = False):
     return_value = xbmcgui.Dialog().select(__language__(30200), names)
     
     if(return_value > -1):
-    
-        WINDOW = xbmcgui.Window( 10000 )
-        userid = WINDOW.clearProperty("userid")
         
         selected_user = userList[return_value]
         log.info("Setting Selected User : " + selected_user)
@@ -129,6 +126,11 @@ def checkServer(force = False):
             __settings__.setSetting("ipaddress", server_address)        
         if __settings__.getSetting("username") != selected_user:          
             __settings__.setSetting("username", selected_user)
+        
+        WINDOW = xbmcgui.Window( 10000 )
+        WINDOW.clearProperty("userid")
+        WINDOW.clearProperty("AccessToken")
 
     xbmc.executebuiltin("ActivateWindow(Home)")
+    xbmc.executebuiltin("XBMC.ReloadSkin()")
                 
\ No newline at end of file
diff --git a/service.py b/service.py
index 42c0a5a..9b349e7 100644
--- a/service.py
+++ b/service.py
@@ -43,11 +43,10 @@ try:
 except Exception, e:
     pass
 
-# start some worker threads
 newWebSocketThread = WebSocketThread()
+newWebSocketThread.setDaemon(True)
 newWebSocketThread.start()
-
-              
+    
 def hasData(data):
     if(data == None or len(data) == 0 or data == "None"):
         return False
@@ -124,24 +123,26 @@ class Service( xbmc.Player ):
 
 monitor = Service()
 lastProgressUpdate = datetime.today()
-
+            
 while not xbmc.abortRequested:
+    
     if xbmc.Player().isPlaying():
         try:
-        
-            playTime = xbmc.Player().getTime()
-            currentFile = xbmc.Player().getPlayingFile()
-            
-            if(monitor.played_information.get(currentFile) != None):
-                monitor.played_information[currentFile]["currentPossition"] = playTime
-            
             # send update
             td = datetime.today() - lastProgressUpdate
             secDiff = td.seconds
             if(secDiff > 5):
+            
+                playTime = xbmc.Player().getTime()
+                currentFile = xbmc.Player().getPlayingFile()
+                
+                if(monitor.played_information.get(currentFile) != None):
+                    monitor.played_information[currentFile]["currentPossition"] = playTime            
+            
                 if(monitor.played_information.get(currentFile) != None and monitor.played_information.get(currentFile).get("item_id") != None):
                     item_id =  monitor.played_information.get(currentFile).get("item_id")
                     newWebSocketThread.sendProgressUpdate(item_id, str(int(playTime * 10000000)))
+                    
                 lastProgressUpdate = datetime.today()
             
         except Exception, e: