Feature/update emails