Improve honeypot spam protection. Bug 945476.