Fix bug on emails