isset not empty incase they want to remove their email
Merge branch 'release/12.0' into develop

* release/12.0:
  isset not empty incase they want to remove their email