Rejoiner

And some tweaks for secure.poopourri.com