Have to test it more, but at least it appears as that both addresses (the old and the new) belong to the button right after you edit it.