More changes done to Login process