Fixing #196 Goodbye Spammer Integration

Fixes merge leftovers - or something else..
Merge pull request #825 from PirataNervo/feature-757

Fixes bug in #757 Buddy System Enhancements