GRD-16 #comment better Person email logic