Fix name and email updating