Remove hacks, escape email