Issue #133 - Fixing user primary email