Changes to the login and fixed null pointer in popup