Added a patch to ensure proper username indexes.