(CE-610) Add option to keep user email