SCAL-431: fixing authentication with login/pass