Fixing issue with removing email