Updated how logins are handled