Bug 1061411 - [Contacts] ICE 1 & ICE 2 can be set to the same contact

I think that your way is easier to do later changes.

If you want I can solve the bug 1061422 too. I have been seeing it and I think that i can solve it.