Fix issue #1 where "Duplicate addresses are added to a user"
#Num: #1