Further improved user ID matching