#686 Escape user's name in first run