Revert to using username in keychain, plus better sign out handling