More login handler work.