Email controller fixed