Fixed username lookups