Fixes #8179 - extraButtonLock and extraButtonPassword might be specified without a value or with 0 or with 1.
