diff --git a/binaries/data/mods/public/gui/credits/texts/programming.json b/binaries/data/mods/public/gui/credits/texts/programming.json
index edc7b3e35e..779cdff116 100644
--- a/binaries/data/mods/public/gui/credits/texts/programming.json
+++ b/binaries/data/mods/public/gui/credits/texts/programming.json
@@ -21,6 +21,7 @@
 		{
 			"List": [
 				{ "nick": "01d55" },
+				{ "nick": "abian", "name": "David Abián" },
 				{ "nick": "aBothe", "name": "Alexander Bothe" },
 				{ "nick": "animus", "name": "Itay Krishtal" },
 				{ "nick": "Acumen", "name": "Stuart Walpole" },
@@ -73,7 +74,6 @@
 				{ "name": "Daniel Trevitz" },
 				{ "nick": "Dariost", "name": "Dario Ostuni" },
 				{ "nick": "Dave", "name": "David Protasowski" },
-				{ "name": "David Abián" },
 				{ "name": "David Marshall" },
 				{ "nick": "dax", "name": "Dacian Fiordean" },
 				{ "nick": "deebee", "name": "Deepak Anthony" },
diff --git a/binaries/data/mods/public/gui/session/selection_panels.js b/binaries/data/mods/public/gui/session/selection_panels.js
index c2b55a14d7..ad8c50ecf4 100644
--- a/binaries/data/mods/public/gui/session/selection_panels.js
+++ b/binaries/data/mods/public/gui/session/selection_panels.js
@@ -330,7 +330,7 @@ g_SelectionPanels.Garrison = {
 			unloadTemplate(template.selectionGroupName || entState.template, entState.player);
 		};
 
-		data.countDisplay.caption = data.item.ents.length || "";
+		data.countDisplay.caption = data.item.ents.length > 1 ? data.item.ents.length : "";
 
 		let canUngarrison = controlsPlayer(data.player) || controlsPlayer(entState.player);
 
@@ -926,7 +926,7 @@ g_SelectionPanels.Selection = {
 		data.guiSelection.sprite = "color:" + g_DiplomacyColors.getPlayerColor(unitOwner, 160);
 		data.guiSelection.hidden = !g_IsObserver;
 
-		data.countDisplay.caption = data.item.ents.length || "";
+		data.countDisplay.caption = data.item.ents.length > 1 ? data.item.ents.length : "";
 
 		data.button.onPress = function() {
 			if (Engine.HotkeyIsPressed("session.deselectgroup"))