Properly set user's email selection options [MJ-131]