Finally fix race condition in diag dashboard showing OK users as orphaned