Fixed bug with email