Fix #2940
Fix #2942
Merge pull request #2943 from gratipay/sign-out-tweaks

sign out tweaks