Made some changes to the ways of logging in.