It was fixed for a short while.
As soon as I removed the password field (as we do not want to send plain text passwords over email) it reverts back to the problem with showing HTML tags.
Why would this be happening each time I try to edit these templates.
Steve