Changed login to be username only.