Moved some of the login related stuff around