more login scenario tweaks