Further progress towards having proper login support