diff --git a/cockatrice/src/tab_room.cpp b/cockatrice/src/tab_room.cpp
index 8b7fb13b..a8258fd7 100644
--- a/cockatrice/src/tab_room.cpp
+++ b/cockatrice/src/tab_room.cpp
@@ -203,6 +203,7 @@ TabRoom::TabRoom(AbstractClient *_client, const QString &_ownName, ServerInfo_Ro
 	const QList<ServerInfo_User *> users = info->getUserList();
 	for (int i = 0; i < users.size(); ++i)
 		userList->processUserInfo(users[i]);
+	userList->sortItems();
 	
 	const QList<ServerInfo_Game *> games = info->getGameList();
 	for (int i = 0; i < games.size(); ++i)
@@ -267,6 +268,7 @@ void TabRoom::processJoinRoomEvent(Event_JoinRoom *event)
 {
 	chatView->appendMessage(QString(), tr("%1 has joined the room.").arg(event->getUserInfo()->getName()));
 	userList->processUserInfo(event->getUserInfo());
+	userList->sortItems();
 }
 
 void TabRoom::processLeaveRoomEvent(Event_LeaveRoom *event)
diff --git a/cockatrice/src/tab_server.cpp b/cockatrice/src/tab_server.cpp
index 5c4766c2..f2ab909a 100644
--- a/cockatrice/src/tab_server.cpp
+++ b/cockatrice/src/tab_server.cpp
@@ -123,6 +123,7 @@ TabServer::TabServer(AbstractClient *_client, ServerInfo_User *userInfo, QWidget
 {
 	roomSelector = new RoomSelector(client);
 	serverInfoBox = new QTextBrowser;
+	serverInfoBox->setOpenExternalLinks(true);
 	userInfoBox = new UserInfoBox(_client, false);
 	userInfoBox->updateInfo(userInfo);
 	userList = new UserList(client, true);