Couple of features

[Xlithan]

Yeah, after thinking about it I knew I probably should have done everything server-side.

I'll try and do it again that way, but I'm still unsure why I couldn't get my mail system working so will need help doing that.