diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp
index c16fbf75e..1e2b62183 100644
--- a/Strategic/mapscreen.cpp
+++ b/Strategic/mapscreen.cpp
@@ -15559,7 +15559,7 @@ void GetMapscreenMercAssignmentString( SOLDIERTYPE *pSoldier, CHAR16 sString[] )
 	}
 	else
 	{
-		if ( gGameExternalOptions.fUseXMLSquadNames )
+		if ( gGameExternalOptions.fUseXMLSquadNames && pSoldier->bAssignment < ON_DUTY )
 			swprintf( sString, L" %s", SquadNames[ pSoldier->bAssignment ].squadname );
 		else
 			wcscpy(sString, pAssignmentStrings[ pSoldier->bAssignment ] );