PERF: Remove n+1 in user directory (PR #13501)

GitHub