Fix email controller