diff --git a/syncplay/client.py b/syncplay/client.py
index 3cb476c..8d2b103 100644
--- a/syncplay/client.py
+++ b/syncplay/client.py
@@ -53,7 +53,7 @@ class SyncplayClient(object):
         self.userlist = SyncplayUserlist(self.ui, self)
         self._protocol = None
         if(config['room'] == None or config['room'] == ''):
-            config['room'] = constants.DEFAULT_ROOM
+            config['room'] = config['name'] # ticket #58
         self.defaultRoom = config['room']
         self.playerPositionBeforeLastSeek = 0.0
         self.setUsername(config['name'])
diff --git a/syncplay/constants.py b/syncplay/constants.py
index af63ae1..fd3465a 100644
--- a/syncplay/constants.py
+++ b/syncplay/constants.py
@@ -4,7 +4,6 @@ OSD_DURATION = 3000
 MPC_OSD_POSITION = 2 #Right corner, 1 for left
 MPLAYER_OSD_LEVEL = 1
 UI_TIME_FORMAT = "[%X] "
-DEFAULT_ROOM = 'default'
 DEFAULT_CONFIG_NAME = ".syncplay"
 
 #Changing these might be ok