More Login changes