diff --git a/Init.cpp b/Init.cpp
index 5fc08570..0fb77b9e 100644
--- a/Init.cpp
+++ b/Init.cpp
@@ -927,7 +927,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
 
 	
 	
-	if (gGameExternalOptions.fEnemyNames == TRUE && gGameExternalOptions.fEnemyRank == FALSE)
+	if (gGameExternalOptions.fEnemyNames == TRUE)
     {
 		// Enemy Names Group by Jazz
 		strcpy(fileName, directoryName);
@@ -980,7 +980,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
 		}
 #endif
 	
-	if (gGameExternalOptions.fEnemyNames == FALSE && gGameExternalOptions.fEnemyRank == TRUE)
+	if (gGameExternalOptions.fEnemyRank == TRUE)
     {
 		// Enemy Rank by Jazz
 		strcpy(fileName, directoryName);
diff --git a/Tactical/Interface.cpp b/Tactical/Interface.cpp
index c1f30767..bb9fd104 100644
--- a/Tactical/Interface.cpp
+++ b/Tactical/Interface.cpp
@@ -2231,7 +2231,7 @@ void DrawSelectedUIAboveGuy( UINT16 usSoldierID )
 					gprintfdirty( sX, sY, NameStr );
 					mprintf( sX, sY, NameStr );	
 				}
-				else if (gGameExternalOptions.fEnemyNames == TRUE  && gGameExternalOptions.fEnemyRank == FALSE)
+				else if (gGameExternalOptions.fEnemyNames == TRUE)
 				{
 					for( iCounter2 = 0; iCounter2 < 500; ++iCounter2 )
 					{
@@ -2255,7 +2255,7 @@ void DrawSelectedUIAboveGuy( UINT16 usSoldierID )
 						}
 					}
 				}
-				else if (gGameExternalOptions.fEnemyNames == FALSE && gGameExternalOptions.fEnemyRank == TRUE)
+				if (gGameExternalOptions.fEnemyRank == TRUE)
 				{
 					for( iCounter2 = 1; iCounter2 < 11; ++iCounter2 )
 					{
@@ -2269,8 +2269,15 @@ void DrawSelectedUIAboveGuy( UINT16 usSoldierID )
 								SetFontBackground( FONT_MCOLOR_BLACK );
 								SetFontForeground( FONT_YELLOW );
 								
+								// need to adjust sYPos because default position already occupied by the name
+								if ( gGameExternalOptions.fSoldierProfiles_Enemy && pSoldier->usSoldierProfile || gGameExternalOptions.fEnemyNames )
+									FindFontCenterCoordinates( sXPos, (INT16)( sYPos + 10 ), (INT16)(80 ), 1, NameStr, TINYFONT1, &sX, &sY );
+
+								// use default position for text
+								else
+									FindFontCenterCoordinates( sXPos, (INT16)( sYPos + 20 ), (INT16)(80 ), 1, NameStr, TINYFONT1, &sX, &sY );
+
 								//legion2
-								FindFontCenterCoordinates( sXPos, (INT16)( sYPos + 20 ), (INT16)(80 ), 1, NameStr, TINYFONT1, &sX, &sY );
 								gprintfdirty( sX, sY, NameStr );
 								mprintf( sX, sY, NameStr );