fixed error in conditions & e-mail source problem