Fix bug that would create an additional email address instead of updating an existing address.