Several bug fixes. Do not require master password if password is overridden.