Fixing issue where users could see all addresses