diff --git a/syncplay/client.py b/syncplay/client.py
index 0974452..295583d 100644
--- a/syncplay/client.py
+++ b/syncplay/client.py
@@ -304,9 +304,6 @@ class SyncplayClient(object):
     def setRoom(self, roomName):
         self.userlist.currentUser.room = roomName
         self.getUserList()
-        if(self._protocol):
-            message = getMessage("en", "room-join-notification").format(self.getUsername(), roomName)
-            self.ui.showMessage(message)
         
     def sendRoom(self):
         room = self.userlist.currentUser.room
@@ -490,9 +487,7 @@ class SyncplayUserlist(object):
         self._roomUsersChanged = True
 
     def __showUserChangeMessage(self, username, room, file_):
-        if(username == self.currentUser.username):
-            pass
-        elif(room and not file_):
+        if(room and not file_):
             message = getMessage("en", "room-join-notification").format(username, room)
             self.ui.showMessage(message)
         elif (room and file_):
diff --git a/syncplay/server.py b/syncplay/server.py
index 88f1221..0896694 100644
--- a/syncplay/server.py
+++ b/syncplay/server.py
@@ -255,7 +255,7 @@ class SyncFactory(Factory):
         self._roomStates[room]["lastUpdate"] = time.time()
         self._deleteRoomIfEmpty(oldRoom)
         watcher.room = room
-        l = lambda w: w.sendUserSetting(watcher.name, watcher.room, watcher.file, None)
+        l = lambda w: w.sendUserSetting(watcher.name, watcher.room, None, None)
         self.broadcast(watcherProtocol, l)
                 
     def watcherSetFile(self, watcherProtocol, file_):