[kirstenboersma]

Same issue over here, both fixes did the trick for me also. But I would rather like to see the fixes build in the Buddypress plugin.