diff --git a/resources/lib/connect.py b/resources/lib/connect.py
index 0feefa79..21afaacc 100644
--- a/resources/lib/connect.py
+++ b/resources/lib/connect.py
@@ -110,13 +110,6 @@ class Connect(object):
                     settings('serverName', client['config/auth.server-name'])
                     settings('server', client['config/auth.server'])
 
-                    if settings('connectMsg.bool'):
-
-                        users = [user for user in settings('additionalUsers').split(',') if user]
-                        users.insert(0, self.user['Name'])
-                        dialog("notification", heading="{emby}", message="%s %s" % (_(33000), ", ".join(users)),
-                                icon="{emby}", time=1500, sound=False)
-
                 event('ServerOnline', {'ServerId': server_id})
                 event('LoadServer', {'ServerId': server_id})
 
diff --git a/resources/lib/entrypoint/service.py b/resources/lib/entrypoint/service.py
index a4c05cdd..261bdb26 100644
--- a/resources/lib/entrypoint/service.py
+++ b/resources/lib/entrypoint/service.py
@@ -234,6 +234,13 @@ class Service(xbmc.Monitor):
                 self.settings['auth_check'] = True
                 self.warn = True
 
+                if settings('connectMsg.bool'):
+
+                    users = [user for user in (settings('additionalUsers') or "").split(',') if user]
+                    users.insert(0, settings('username'))
+                    dialog("notification", heading="{emby}", message="%s %s" % (_(33000), ", ".join(users)),
+                            icon="{emby}", time=1500, sound=False)
+
                 if self.library_thread is None:
 
                     self.library_thread = library.Library(self)