Fixing up e-mail routes and pages