Improved links to users and companies

Change-Id: I4f5c821df2b50ed5728afcc5b605f9672cff09f5