diff --git a/src/viewport.cpp b/src/viewport.cpp
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -1407,8 +1407,8 @@ static void ViewportAddKdtreeSigns(DrawP
 
 	for (const auto *t : towns) {
 		ViewportAddString(dpi, ZOOM_LVL_OUT_16X, &t->cache.sign,
-			_settings_client.gui.population_in_label ? STR_VIEWPORT_TOWN_POP : STR_VIEWPORT_TOWN,
-			STR_VIEWPORT_TOWN_TINY_WHITE, STR_VIEWPORT_TOWN_TINY_BLACK,
+			t->Label(),
+			t->SmallLabel(), STR_VIEWPORT_TOWN_TINY_BLACK,
 			t->index, t->cache.population);
 	}