Email fix
Name fix