First pass at fixing activation redirects from Microsoft mail

See #957