Fix to login/logout on mobile
Merge