More login improvements