adapted to new login service