Itty bitty sign out fix

This is the final bit to call: #83, #68, and #42 fixed.

@pdehaan r?