Revert "Fixed username lookups"

This reverts commit 8b04d0f6aee6ceba64769ce106d951d07213f4ee.