Cleanup on email validation & added validation on unique handles.  Fixes #5