More login upgrades