Removing wrong account on save/update

Adding/Updating a duplicate account would remove the first account in the list not necessarily the matching account