Fix messed up user links.
Merge pull request #265 from TheMightyBuzzard/master

Fix messed up user links.
Merge remote-tracking branch 'upstream/master' into subscriptions