Store encryption key overrides per address and then per protocol
... instead of per protocol and then per address