Also rename one of the new functional opts in login.go to more accurately reflect the intention of the opt.