Index: ps/trunk/binaries/data/mods/public/gui/lobby/lobby.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/lobby/lobby.js
+++ ps/trunk/binaries/data/mods/public/gui/lobby/lobby.js
@@ -350,6 +350,7 @@
 	updateSubject(Engine.LobbyGetRoomSubject());
 	updateLobbyColumns();
 
+	updateToggleBuddy();
 	Engine.GetGUIObjectByName("chatInput").tooltip = colorizeAutocompleteHotkey();
 }
 
@@ -533,6 +534,19 @@
 }
 
 /**
+ * Update the caption of the toggle buddy button.
+ */
+function updateToggleBuddy()
+{
+	let playerList = Engine.GetGUIObjectByName("playersBox");
+	let playerName = playerList.list[playerList.selected];
+
+	let toggleBuddyButton = Engine.GetGUIObjectByName("toggleBuddyButton");
+	toggleBuddyButton.caption = g_Buddies.indexOf(playerName) != -1 ? translate("Unmark as Buddy") : translate("Mark as Buddy");
+	toggleBuddyButton.enabled = playerName && playerName != g_Username;
+}
+
+/**
  * Do a full update of the player listing, including ratings from cached C++ information.
  */
 function updatePlayerList()
@@ -635,6 +649,8 @@
 	else
 		g_Buddies.push(name);
 
+	updateToggleBuddy();
+
 	// Don't save empty strings to the config file
 	let buddies = g_Buddies.filter(nick => nick).join(g_BuddyListDelimiter) || g_BuddyListDelimiter;
 	Engine.ConfigDB_CreateValue("user", "lobby.buddies", buddies);
@@ -689,6 +705,8 @@
 {
 	lookupSelectedUserProfile("playersBox");
 
+	updateToggleBuddy();
+
 	let playerList = Engine.GetGUIObjectByName("playersBox");
 	if (playerList.selected != -1)
 		selectGameFromPlayername(playerList.list[playerList.selected]);
Index: ps/trunk/binaries/data/mods/public/gui/lobby/lobby.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/lobby/lobby.xml
+++ ps/trunk/binaries/data/mods/public/gui/lobby/lobby.xml
@@ -91,7 +91,6 @@
 
 		<object name="leftButtonPanel" size="20 100%-105 20% 100%-20">
 			<object name="toggleBuddyButton" type="button" style="ModernButtonRed" size="0 100%-85 100% 100%-60">
-				<translatableAttribute id="caption" comment="Toggle Buddy">Toggle Buddy</translatableAttribute>
 				<action on="Press">
 					toggleBuddy();
 				</action>