Fix up PPR behaviour for charging addresses