Fixed primary email flag [MJ-337]