User linking fixes.