temp patch for 1652
some polish for a turd
Merge pull request #1721 from ether/dont-send-same-cs-spam

temp patch for #1652