Made some changes to login and security