Re-scanning a node after a LAN renumber updated the FIPS peer (npub- matched) but duplicated the saved-server entry (address-matched). ServerEntry now carries the node's fnpub as a trailing serialization field (legacy entries still parse) and every saved/active-entry match goes through sameNode: npub identity first, address/port/scheme only as the LAN-only fallback. Edit forms that don't carry the npub keep the stored one. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>