Login now pops up
Fixed merge conflict with login