diff --git a/resources/lib/librarysync.py b/resources/lib/librarysync.py
index 76f343d0..ae61e5c2 100644
--- a/resources/lib/librarysync.py
+++ b/resources/lib/librarysync.py
@@ -361,6 +361,8 @@ class LibrarySync(Thread):
         self.compare = manualrun or repair
 
         xbmc.executebuiltin('InhibitIdleShutdown(true)')
+        screensaver = utils.getScreensaver()
+        utils.setScreensaver(value="")
 
         # Add sources
         utils.sourcesXML()
@@ -373,6 +375,7 @@ class LibrarySync(Thread):
         # Set views. Abort if unsuccessful
         if not self.maintainViews():
             xbmc.executebuiltin('InhibitIdleShutdown(false)')
+            utils.setScreensaver(value=screensaver)
             return False
 
         process = {
@@ -385,6 +388,7 @@ class LibrarySync(Thread):
             completed = process[itemtype]()
             if not completed:
                 xbmc.executebuiltin('InhibitIdleShutdown(false)')
+                utils.setScreensaver(value=screensaver)
                 return False
 
         # Let kodi update the views in any case, since we're doing a full sync
@@ -394,6 +398,7 @@ class LibrarySync(Thread):
 
         utils.window('emby_initialScan', clear=True)
         xbmc.executebuiltin('InhibitIdleShutdown(false)')
+        utils.setScreensaver(value=screensaver)
         return True
 
     def processView(self, folderItem, kodi_db, emby_db, totalnodes):
diff --git a/resources/lib/userclient.py b/resources/lib/userclient.py
index 9d24162e..7150e0e1 100644
--- a/resources/lib/userclient.py
+++ b/resources/lib/userclient.py
@@ -349,7 +349,7 @@ class UserClient(threading.Thread):
             dialog = xbmcgui.Dialog()
             if username:
                 dialog.notification(self.addonName,
-                                    "Welcome %s" % username,
+                                    "Welcome %s" % username.decode('utf-8'),
                                     "special://home/addons/plugin.video."
                                     "plexkodiconnect/icon.png")
             else: