Add user tags to links - refs BT#7287