#324: login flow fixed