#810 - Double email error