Fix user links and message