Un-borked logout/login process