Double-escaping the user's data and enhanced the website verification enhancement. (reverse-merged from commit bae6745f65e66a2082d56aca9571314654ac3734)
See 16#issuecomment-13046002