Preserve SIP URI properly