[fix] Better login handling