@seanmonstar - I wasn't sure how to handle this one, because we do the `escape(email)` in other places. Doh, that is without the _.