fixes #6524

This fixes #6524 

I've found 3 occasions where the player name was allowed to become part of the formatting string.