Fixed problem where primary email address was not set to the right email address always.
This is fixed.

Signed-off-by: Michel Verbraak <michel@1st-setup.nl>