Index: binaries/data/mods/public/gui/common/gamedescription.js
===================================================================
--- binaries/data/mods/public/gui/common/gamedescription.js
+++ binaries/data/mods/public/gui/common/gamedescription.js
@@ -1,4 +1,9 @@
 /**
+ * Color for indicating the user in the playerlist and the game where he is listed.
+ */
+var g_UserColor = "blue";
+
+/**
  * Highlights the victory condition in the game-description.
  */
 var g_DescriptionHighlight = "orange";
@@ -14,7 +19,6 @@
  */
 var g_BuddyListDelimiter = ",";
 
-
 /**
  * Returns the nickname without the lobby rating.
  */
@@ -39,6 +43,11 @@
 var g_BuddySymbol = '•';
 
 /**
+ * Denotes which player are a lobby is the current user.
+ */
+var g_UserSymbol = '‣';
+
+/**
  * Returns map description and preview image or placeholder.
  */
 function getMapDescriptionAndPreview(mapType, mapName)
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
@@ -602,7 +602,7 @@
 function updatePlayerList()
 {
 	let playersBox = Engine.GetGUIObjectByName("playersBox");
-	let sortBy = playersBox.selected_column || "name";
+	let sortBy = playersBox.selected_column || "buddy";
 	let sortOrder = playersBox.selected_column_order || 1;
 
 	let buddyStatusList = [];
@@ -623,16 +623,26 @@
 		switch (sortBy)
 		{
 		case 'buddy':
-			sortA = (a.isBuddy ? 1 : 2) + statusA;
-			sortB = (b.isBuddy ? 1 : 2) + statusB;
+			sortA = (a.name == g_Username ? 0 : a.isBuddy ? 1 : 2) + statusA;
+			sortB = (b.name == g_Username ? 0 : b.isBuddy ? 1 : 2) + statusB;
 			break;
 		case 'rating':
 			sortA = +a.rating;
 			sortB = +b.rating;
 			break;
 		case 'status':
-			sortA = statusA;
-			sortB = statusB;
+			sortA = statusOrder.indexOf(a.presence);
+			sortB = statusOrder.indexOf(b.presence);
+
+			// if presences equal user priored first/last
+			if (sortA == sortB)
+			{
+				if (a.name == g_Username) return -sortOrder;
+				if (b.name == g_Username) return +sortOrder;
+			}
+
+			sortA += b.name.toLowerCase();
+			sortB += a.name.toLowerCase();
 			break;
 		case 'name':
 		default:
@@ -656,8 +666,9 @@
 		if (presence == "unknown")
 			warn("Unknown presence:" + player.presence);
 
-		let statusColor = g_PlayerStatuses[presence].color;
-		buddyStatusList.push(player.isBuddy ? coloredText(g_BuddySymbol, statusColor) : "");
+		let statusColor = player.name == g_Username ? g_UserColor : g_PlayerStatuses[presence].color;
+		let buddySymbol = player.name == g_Username ? g_UserSymbol : player.isBuddy ? g_BuddySymbol : "";
+		buddyStatusList.push(coloredText(buddySymbol, statusColor));
 		playerList.push(colorPlayerName((player.role == "moderator" ? g_ModeratorPrefix : "") + player.name));
 		presenceList.push(coloredText(g_PlayerStatuses[presence].status, statusColor));
 		ratingList.push(coloredText(rating, statusColor));
@@ -921,6 +932,8 @@
 			// Sort games with playing buddies above games with spectating buddies
 			if (game.hasBuddies < 2 && g_Buddies.indexOf(nick) != -1)
 				game.hasBuddies = player.Team == "observer" ? 1 : 2;
+
+			game.hasUser = game.hasUser || player.Name == g_Username;
 		}
 
 		game.gameRating =
@@ -930,6 +943,9 @@
 
 		return game;
 	}).filter(game => !filterGame(game)).sort((a, b) => {
+		// keep user games priored first/last
+		if (a.hasUser) return -sortOrder;
+		if (b.hasUser) return +sortOrder;
 		let sortA, sortB;
 		switch (sortBy)
 		{
@@ -981,8 +997,11 @@
 		if (game.ip == g_SelectedGameIP && game.port == g_SelectedGamePort)
 			selectedGameIndex = +i;
 
-		list_buddy.push(game.hasBuddies ? coloredText(g_BuddySymbol, g_GameColors[game.state]) : "");
-		list_name.push(coloredText(gameName, g_GameColors[game.state]));
+		list_buddy.push(game.hasBuddies ? coloredText(
+			game.hasUser ? g_UserSymbol : g_BuddySymbol,
+			game.hasUser ? g_UserColor : g_GameColors[game.state])
+			: "");
+		list_name.push(coloredText(gameName, game.hasUser ? g_UserColor : g_GameColors[game.state]));
 		list_mapName.push(translateMapTitle(game.niceMapName));
 		list_mapSize.push(translateMapSize(game.mapSize));
 		list_mapType.push(g_MapTypes.Title[mapTypeIdx] || "");
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
@@ -10,7 +10,7 @@
 	<object name="leftPanel" size="20 30 20% 100%-310">
 		<object name="playersBox"
 			style="ModernSortedList"
-			selected_column="name"
+			selected_column="buddy"
 			selected_column_order="1"
 			type="olist"
 			sortable="true"
@@ -174,7 +174,7 @@
 	<object name="middlePanel" size="20%+5 5% 100%-255 97.2%">
 		<object name="gamesBox"
 			style="ModernSortedList"
-			selected_column="name"
+			selected_column="buddy"
 			selected_column_order="1"
 			type="olist"
 			sortable="true"