Wrong password should result in having to cancel auth.
Pull in upstream changes