Email selector more finely grained for #52