diff --git a/asmodee.py b/asmodee.py
index 071f7c9..7216401 100755
--- a/asmodee.py
+++ b/asmodee.py
@@ -1539,9 +1539,14 @@ def bienvenue(event): # Affichage d'un message d'accueil aux nouveaux venus
 		membership = event['content']['membership']
 		prev_member = event.get('unsigned',{}).get('prev_content',{}).get('membership', None)
 		nick = getNick(room,event)
-		alias = ""
-		if (len(room.aliases) > 0):
-			alias = room.aliases[0]
+		if room.name:
+			alias = room.name
+		elif room.canonical_alias:
+			alias = room.canonical_alias 
+		elif room.aliases:
+			alias = room.aliases[0] 
+		else:
+			alias = ""
 		reponse = ""
 		try:
 		#if (len(welcome[room.room_id]) > 0):