Changed login to involve username