diff --git a/application/views/ConversationView.cpp b/application/views/ConversationView.cpp
index 9e2ff4f..29e40b6 100644
--- a/application/views/ConversationView.cpp
+++ b/application/views/ConversationView.cpp
@@ -230,6 +230,11 @@ ConversationView::ObserveString(int32 what, BString str)
 {
 	switch (what)
 	{
+		case STR_ROOM_NAME:
+		{
+			fNameTextView->SetText(str);
+			break;
+		}
 		case STR_ROOM_SUBJECT:
 		{
 			fSubjectTextView->SetText(str);
diff --git a/application/windows/JoinWindow.cpp b/application/windows/JoinWindow.cpp
index dab3178..f738e11 100644
--- a/application/windows/JoinWindow.cpp
+++ b/application/windows/JoinWindow.cpp
@@ -20,7 +20,7 @@ const uint32 kAccSelected = 'JWas';
 
 JoinWindow::JoinWindow(BMessenger* messenger, AccountInstances accounts)
 	:
-	BWindow(BRect(0, 0, 300, 100), "Join a room", B_FLOATING_WINDOW, 0),
+	BWindow(BRect(0, 0, 400, 100), "Join a room", B_FLOATING_WINDOW, 0),
 	fTarget(messenger),
 	fAccounts(accounts),
 	fSelectedAcc(0)
@@ -109,7 +109,10 @@ JoinWindow::_CreateAccountMenu()
 	menu->SetRadioMode(true);
 	menu->SetLabelFromMarked(true);
 	menu->ItemAt(fSelectedAcc)->SetMarked(true);
-		
+
+	if (fAccounts.CountItems() == 0)
+		menu->SetEnabled(false);
+
 	return menu;
 }