E-mail fix

stopped our code being too dustin-centric