Fixed address saving for contact, refactored a bit