Changed email controller