[PATCH 1/2] Check passphrase unless explicit cancel (#821724)