diff --git a/source/game/menu/menu_state_connected_game.cpp b/source/game/menu/menu_state_connected_game.cpp
index d7f566cdb..5b6447037 100644
--- a/source/game/menu/menu_state_connected_game.cpp
+++ b/source/game/menu/menu_state_connected_game.cpp
@@ -380,6 +380,8 @@ namespace Game {
 
 		labelMapInfo.registerGraphicComponent(containerName, "labelMapInfo");
 		labelMapInfo.init(xoffset + 100, mapPos - labelOffset - 10, 200, 40);
+		labelMapInfo.setFont(CoreData::getInstance().getDisplayFontSmall());
+		labelMapInfo.setFont3D(CoreData::getInstance().getDisplayFontSmall3D());
 		labelMapInfo.setText("");
 
 		labelMap.registerGraphicComponent(containerName, "labelMap");
diff --git a/source/game/menu/menu_state_custom_game.cpp b/source/game/menu/menu_state_custom_game.cpp
index 87fbe4b2c..f32582f2f 100644
--- a/source/game/menu/menu_state_custom_game.cpp
+++ b/source/game/menu/menu_state_custom_game.cpp
@@ -450,6 +450,8 @@ namespace Game {
 
 			labelMapInfo.registerGraphicComponent(containerName, "labelMapInfo");
 			labelMapInfo.init(xoffset + 100, mapPos - labelOffset - 10, 200, 40);
+			labelMapInfo.setFont(CoreData::getInstance().getDisplayFontSmall());
+			labelMapInfo.setFont3D(CoreData::getInstance().getDisplayFontSmall3D());
 
 			labelTileset.registerGraphicComponent(containerName, "labelTileset");
 			labelTileset.init(xoffset + 500, mapHeadPos);
diff --git a/source/shared_lib/sources/map/map_preview.cpp b/source/shared_lib/sources/map/map_preview.cpp
index ae416a151..25babfd7c 100644
--- a/source/shared_lib/sources/map/map_preview.cpp
+++ b/source/shared_lib/sources/map/map_preview.cpp
@@ -1088,7 +1088,15 @@ namespace Shared {
 						mapInfo->hardMaxPlayers = mapInfo->players;
 
 						mapInfo->desc = i18nMaxMapPlayersTitle + ": " + intToStr(mapInfo->players) + "\n";
-						mapInfo->desc += i18nMapSizeTitle + ": " + intToStr(mapInfo->size.x) + " x " + intToStr(mapInfo->size.y);
+						mapInfo->desc += i18nMapSizeTitle + ": " + intToStr(mapInfo->size.x) + " x " + intToStr(mapInfo->size.y) + "\n";
+						string author = header.author;
+						if (author.length() > 0) {
+							author = "by " + author;
+						}
+						if (author.length() > 35) {
+							author = author.substr(0, 35) + "...";
+						}
+						mapInfo->desc += author;
 
 						validMap = true;
 					}