Fix regression caused by using eventoId as username