Fixed login. Preparing to merge