Fixes for social help

OMG LOL!  It got rebased of Gonzalo's commit - sorry :smile: