Improved linking on user calls