More tweaks to login stuff