diff --git a/resources/lib/userclient.py b/resources/lib/userclient.py
index 7150e0e1..a2c6cf17 100644
--- a/resources/lib/userclient.py
+++ b/resources/lib/userclient.py
@@ -348,15 +348,15 @@ class UserClient(threading.Thread):
             self.currUser = username
             dialog = xbmcgui.Dialog()
             if username:
-                dialog.notification(self.addonName,
-                                    "Welcome %s" % username.decode('utf-8'),
-                                    "special://home/addons/plugin.video."
-                                    "plexkodiconnect/icon.png")
+                dialog.notification(
+                    heading=self.addonName,
+                    message="Welcome %s" % username.decode('utf-8'),
+                    icon="special://home/addons/plugin.video.plexkodiconnect/icon.png")
             else:
-                dialog.notification(self.addonName,
-                                    "Welcome",
-                                    "special://home/addons/plugin.video."
-                                    "plexkodiconnect/icon.png")
+                dialog.notification(
+                    heading=self.addonName,
+                    message="Welcome",
+                    icon="special://home/addons/plugin.video.plexkodiconnect/icon.png")
             settings('accessToken', value=accessToken)
             settings('userId%s' % username, value=userId)
             log("User authenticated with an access token", 1)
diff --git a/service.py b/service.py
index 05447623..c7932137 100644
--- a/service.py
+++ b/service.py
@@ -321,7 +321,8 @@ class Service():
 delay = int(utils.settings('startupDelay'))
 
 xbmc.log("Delaying Plex startup by: %s sec..." % delay)
-if delay and xbmc.Monitor().waitForAbort(delay):
+# Plex: add 3 seconds just for good measure
+if delay and xbmc.Monitor().waitForAbort(delay+3):
     # Start the service
     xbmc.log("Abort requested while waiting. Emby for kodi not started.")
 else: