issue #691 email being in use
Merge branch '691' into develop