Changed around logins a bit