Updated login related changes