Better login/logout API.
Hotfix
Hotfix