Index: binaries/data/mods/public/gui/lobby/lobby.js
===================================================================
--- binaries/data/mods/public/gui/lobby/lobby.js
+++ binaries/data/mods/public/gui/lobby/lobby.js
@@ -14,11 +14,6 @@
 const g_CivData = loadCivData(false, false);
 
 /**
- * A symbol which is prepended to the username of moderators.
- */
-var g_ModeratorPrefix = "@";
-
-/**
  * Current username. Cannot contain whitespace.
  */
 const g_Username = Engine.LobbyGetNick();
@@ -54,10 +49,32 @@
 	"unknown":   { "color": "178 178 178", "status": translateWithContext("lobby presence", "Unknown") }
 };
 
-var g_RoleNames = {
-	"moderator": translate("Moderator"),
-	"participant": translate("Player"),
-	"visitor": translate("Muted Player")
+var g_LobbyRoles = {
+	"moderator": {
+		"label": translate("Moderator"),
+		"description": translate("This user enforces the Terms of Use, can mute, kick or ban players."),
+		"nickprefix": "@"
+	},
+	"participant": {
+		"label": translate("Player"),
+		"description": translate("This is a regular player."),
+		"nickprefix": ""
+	},
+	"visitor": {
+		"label": translate("Muted Player"),
+		"description": translate("This player does not deserve to speak."),
+		"nickprefix": "*"
+	},
+	"xpartamupp": {
+		"label": translate("Gamelist Bot"),
+		"description": translate("This is the bot who provides the list of active games."),
+		"nickprefix": "#"
+	},
+	"echelon": {
+		"label": translate("Rating Bot"),
+		"description": translate("This bot gives players a score who played a rated 1v1."),
+		"nickprefix": "#"
+	}
 };
 
 /**
@@ -467,7 +484,7 @@
 
 	Engine.GetGUIObjectByName("middlePanel").size = "20%+5 " + (g_Dialog ? "18" : "40") + " 100%-255 100%-20";
 	Engine.GetGUIObjectByName("rightPanel").size = "100%-250 " + (g_Dialog ? "18" : "40") + " 100%-20 100%-20";
-	Engine.GetGUIObjectByName("leftPanel").size = "20 " + (g_Dialog ? "18" : "40") + " 20% 100%-315";
+	Engine.GetGUIObjectByName("leftPanel").size = "20 " + (g_Dialog ? "18" : "40") + " 20% 100%-335";
 
 	if (g_Dialog)
 	{
@@ -750,7 +767,7 @@
 
 		let statusColor = g_PlayerStatuses[presence].color;
 		buddyStatusList.push(player.isBuddy ? coloredText(g_BuddySymbol, statusColor) : "");
-		playerList.push(colorPlayerName((player.role == "moderator" ? g_ModeratorPrefix : "") + player.name));
+		playerList.push(colorPlayerName(player.name, "", getLobbyRole(player.name).nickprefix + player.name));
 		presenceList.push(coloredText(g_PlayerStatuses[presence].status, statusColor));
 		ratingList.push(coloredText(rating, statusColor));
 		nickList.push(player.name);
@@ -889,7 +906,19 @@
 
 function updateUserRoleText(playerName)
 {
-	Engine.GetGUIObjectByName("roleText").caption = g_RoleNames[Engine.LobbyGetPlayerRole(playerName) || "participant"];
+	let lobbyRole = getLobbyRole(playerName);
+	Engine.GetGUIObjectByName("roleText").caption = lobbyRole ? lobbyRole.label : translate("N/A");
+	Engine.GetGUIObjectByName("roleDescription").caption = lobbyRole ? lobbyRole.description : "";
+
+}
+
+function getLobbyRole(nickname)
+{
+	for (let botName of ["xpartamupp", "echelon"])
+		if (Engine.LobbyGetPlayerUsername(nickname) == Engine.ConfigDB_GetValue("user", "lobby." + botName))
+			return g_LobbyRoles[botName];
+
+	return g_LobbyRoles[Engine.LobbyGetPlayerRole(nickname)] || undefined;
 }
 
 /**
@@ -1387,8 +1416,8 @@
 {
 	if (msg.from)
 	{
-		if (Engine.LobbyGetPlayerRole(msg.from) == "moderator")
-			msg.from = g_ModeratorPrefix + msg.from;
+		let lobbyRole = getLobbyRole(msg.from);
+		msg.from = (lobbyRole ? lobbyRole.nickprefix : "") + msg.from;
 
 		// Highlight local user's nick
 		if (g_Username != msg.from)
@@ -1559,21 +1588,19 @@
 }
 
 /**
- * Returns the given playername wrapped in an appropriate color-tag.
- *
- * @param {string} playername
- * @param {string} rating
+ * Returns the given string or playername colorized in a unique color for that player.
+ * This helps the reader to follow the chat conversation.
  */
-function colorPlayerName(playername, rating)
+function colorPlayerName(playername, rating = "", string = "")
 {
 	return coloredText(
 		(rating ? sprintf(
 			translate("%(nick)s (%(rating)s)"), {
-				"nick": playername,
+				"nick": string || playername,
 				"rating": rating
-			}) : playername
+			}) : (string || playername)
 		),
-		getPlayerColor(playername.replace(g_ModeratorPrefix, "")));
+		getPlayerColor(playername));
 }
 
 function senderFont(text)
Index: binaries/data/mods/public/gui/lobby/lobby_panels.xml
===================================================================
--- binaries/data/mods/public/gui/lobby/lobby_panels.xml
+++ binaries/data/mods/public/gui/lobby/lobby_panels.xml
@@ -16,7 +16,6 @@
 			selected_column_order="1"
 			type="olist"
 			sortable="true"
-			size="0 0 100% 100%"
 			font="sans-bold-stroke-13"
 		>
 			<column id="buddy" width="12"/>
@@ -43,35 +42,36 @@
 		</object>
 	</object>
 
-	<object name="profilePanel" size="20 100%-310 20% 100%-104">
-		<object name="profileBox" type="image" sprite="ModernDarkBoxGold" size="0 0 100% 100%">
-			<object name="profileArea" size="0 0 100% 100%" hidden="true">
+	<object name="profilePanel" size="20 100%-330 20% 100%-104">
+		<object name="profileBox" type="image" sprite="ModernDarkBoxGold">
+			<object name="profileArea" hidden="true">
 				<object name="usernameText" size="0 0 100% 45" type="text" style="ModernLabelText" font="sans-bold-16" />
 				<object name="roleText" size="0 45 100% 70" type="text" style="ModernLabelText" font="sans-bold-stroke-12" />
-				<object size="0 70 40%+40 90" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
+				<object name="roleDescription" size="0 65 100% 85" type="text" style="ModernLabelText" font="sans-12" />
+				<object size="0 90 40%+40 110" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
 					<translatableAttribute id="caption">Current Rank:</translatableAttribute>
 				</object>
-				<object name="rankText" size="40%+45 70 100% 90" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
-				<object size="0 90 40%+40 110" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
+				<object name="rankText" size="40%+45 90 100% 110" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
+				<object size="0 110 40%+40 130" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
 					<translatableAttribute id="caption">Highest Rating:</translatableAttribute>
 				</object>
-				<object name="highestRatingText" size="40%+45 90 100% 110" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
-				<object size="0 110 40%+40 130" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
+				<object name="highestRatingText" size="40%+45 110 100% 130" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
+				<object size="0 130 40%+40 150" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
 					<translatableAttribute id="caption">Total Games:</translatableAttribute>
 				</object>
-				<object name="totalGamesText" size="40%+45 110 100% 130" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
-				<object size="0 130 40%+40 150" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
+				<object name="totalGamesText" size="40%+45 130 100% 150" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
+				<object size="0 150 40%+40 170" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
 					<translatableAttribute id="caption">Wins:</translatableAttribute>
 				</object>
-				<object name="winsText" size="40%+45 130 100% 150" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
-				<object size="0 150 40%+40 170" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
+				<object name="winsText" size="40%+45 150 100% 170" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
+				<object size="0 170 40%+40 190" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
 					<translatableAttribute id="caption">Losses:</translatableAttribute>
 				</object>
-				<object name="lossesText" size="40%+45 150 100% 170" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
-				<object size="0 170 40%+40 190" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
+				<object name="lossesText" size="40%+45 170 100% 190" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
+				<object size="0 190 40%+40 210" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
 					<translatableAttribute id="caption">Win Rate:</translatableAttribute>
 				</object>
-				<object name="ratioText" size="40%+45 170 100% 190" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
+				<object name="ratioText" size="40%+45 190 100% 210" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
 			</object>
 		</object>
 	</object>
Index: source/lobby/IXmppClient.h
===================================================================
--- source/lobby/IXmppClient.h
+++ source/lobby/IXmppClient.h
@@ -49,6 +49,7 @@
 	virtual void SetPresence(const std::string& presence) = 0;
 	virtual void GetPresence(const std::string& nickname, std::string& presence) = 0;
 	virtual void GetRole(const std::string& nickname, std::string& role) = 0;
+	virtual void GetUsername(const std::string& nickname, std::string& username) = 0;
 	virtual void GetSubject(std::string& subject) = 0;
 	virtual void GUIGetPlayerList(const ScriptInterface& scriptInterface, JS::MutableHandleValue ret) = 0;
 	virtual void ClearPresenceUpdates() = 0;
Index: source/lobby/XmppClient.h
===================================================================
--- source/lobby/XmppClient.h
+++ source/lobby/XmppClient.h
@@ -82,6 +82,7 @@
 	void SetPresence(const std::string& presence);
 	void GetPresence(const std::string& nickname, std::string& presence);
 	void GetRole(const std::string& nickname, std::string& role);
+	void GetUsername(const std::string& nickname, std::string& username);
 	void GetSubject(std::string& subject);
 
 	void GUIGetPlayerList(const ScriptInterface& scriptInterface, JS::MutableHandleValue ret);
@@ -167,7 +168,7 @@
 		const std::time_t time = std::time(nullptr));
 
 private:
-	/// Map of players
+	/// Maps from nickname to {presence, rating, role, username}
 	std::map<std::string, std::vector<std::string> > m_PlayerMap;
 	/// List of games
 	std::vector<const glooxwrapper::Tag*> m_GameList;
Index: source/lobby/XmppClient.cpp
===================================================================
--- source/lobby/XmppClient.cpp
+++ source/lobby/XmppClient.cpp
@@ -513,6 +513,7 @@
 		scriptInterface.SetProperty(player, "presence", wstring_from_utf8(p.second[0]));
 		scriptInterface.SetProperty(player, "rating", wstring_from_utf8(p.second[1]));
 		scriptInterface.SetProperty(player, "role", wstring_from_utf8(p.second[2]));
+		scriptInterface.SetProperty(player, "username", wstring_from_utf8(p.second[3]));
 		scriptInterface.CallFunctionVoid(ret, "push", player);
 	}
 }
@@ -822,12 +823,12 @@
 		{
 			// we have a nick change
 			std::string newNick = participant.newNick.to_string();
-			m_PlayerMap[newNick].resize(3);
+			m_PlayerMap[newNick].resize(4);
 			m_PlayerMap[newNick][0] = presenceString;
 			m_PlayerMap[newNick][2] = roleString;
-
-			DbgXMPP(nick << " is now known as " << participant.newNick.to_string());
-			CreateGUIMessage("chat", "nick", "oldnick", nick, "newnick", participant.newNick.to_string());
+			m_PlayerMap[newNick][3] = participant.jid->username().to_string();
+			DbgXMPP(nick << " is now known as " << newNick);
+			CreateGUIMessage("chat", "nick", "oldnick", nick, "newnick", newNick);
 		}
 		else if (participant.flags & gloox::UserKicked)
 		{
@@ -865,9 +866,11 @@
 			CreateGUIMessage("chat", "presence", "nick", nick);
 
 		DbgXMPP(nick << " is in the room, presence : " << (int)presenceType);
-		m_PlayerMap[nick].resize(3);
+
+		m_PlayerMap[nick].resize(4);
 		m_PlayerMap[nick][0] = presenceString;
 		m_PlayerMap[nick][2] = roleString;
+		m_PlayerMap[nick][3] = participant.jid->username().to_string();
 	}
 }
 
@@ -978,6 +981,21 @@
 		role = "";
 }
 
+/**
+ * Get the current xmpp username of the given nick.
+ *
+ * @param nick Nickname to look up presence for
+ * @param username Variable to store the role in
+ */
+void XmppClient::GetUsername(const std::string& nick, std::string& username)
+{
+	if (m_PlayerMap.find(nick) != m_PlayerMap.end())
+		username = m_PlayerMap[nick][3];
+	else
+		username = std::string();
+}
+
+
 /*****************************************************
  * Utilities                                         *
  *****************************************************/
Index: source/lobby/scripting/JSInterface_Lobby.h
===================================================================
--- source/lobby/scripting/JSInterface_Lobby.h
+++ source/lobby/scripting/JSInterface_Lobby.h
@@ -59,6 +59,7 @@
 	void LobbyBan(ScriptInterface::CxPrivate* pCxPrivate, const std::wstring& nick, const std::wstring& reason);
 	std::wstring LobbyGetPlayerPresence(ScriptInterface::CxPrivate* pCxPrivate, const std::wstring& nickname);
 	std::wstring LobbyGetPlayerRole(ScriptInterface::CxPrivate* pCxPrivate, const std::wstring& nickname);
+	std::wstring LobbyGetPlayerUsername(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), const std::wstring& nickname);
 	std::wstring LobbyGetRoomSubject(ScriptInterface::CxPrivate* pCxPrivate);
 
 	// Non-public secure PBKDF2 hash function with salting and 1,337 iterations
Index: source/lobby/scripting/JSInterface_Lobby.cpp
===================================================================
--- source/lobby/scripting/JSInterface_Lobby.cpp
+++ source/lobby/scripting/JSInterface_Lobby.cpp
@@ -67,6 +67,7 @@
 	scriptInterface.RegisterFunction<void, std::wstring, std::wstring, &JSI_Lobby::LobbyBan>("LobbyBan");
 	scriptInterface.RegisterFunction<std::wstring, std::wstring, &JSI_Lobby::LobbyGetPlayerPresence>("LobbyGetPlayerPresence");
 	scriptInterface.RegisterFunction<std::wstring, std::wstring, &JSI_Lobby::LobbyGetPlayerRole>("LobbyGetPlayerRole");
+	scriptInterface.RegisterFunction<std::wstring, std::wstring, &JSI_Lobby::LobbyGetPlayerUsername>("LobbyGetPlayerUsername");
 	scriptInterface.RegisterFunction<std::wstring, std::wstring, std::wstring, &JSI_Lobby::EncryptPassword>("EncryptPassword");
 	scriptInterface.RegisterFunction<std::wstring, &JSI_Lobby::LobbyGetRoomSubject>("LobbyGetRoomSubject");
 #endif // CONFIG2_LOBBY
@@ -332,6 +333,16 @@
 	return wstring_from_utf8(role);
 }
 
+std::wstring JSI_Lobby::LobbyGetPlayerUsername(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), const std::wstring& nickname)
+{
+	if (!g_XmppClient)
+		return L"";
+
+	std::string username;
+	g_XmppClient->GetUsername(utf8_from_wstring(nickname), username);
+	return wstring_from_utf8(username);
+}
+
 // Non-public secure PBKDF2 hash function with salting and 1,337 iterations
 //
 // TODO: We should use libsodium's crypto_pwhash instead of this. The first reason is that