Fixed email save
Fixed email save