Hotfix/address user and address copy update