Verify that empty email is not added into user profile

Closes bug #1228107

Change-Id: I5ad0cf0ba0bacc50419c01f46623d30b38574305