moved primary email from xuser to user