Updated login to match requirements