You're exactly right. I tried a cleaner, "less is more" approach on the generate override key bit and the password settings instructions (see note below).