Transferring changes in get_user() to feature (orig in stable)
Merge pull request #125 from WildcardSearch/feature

Solve potential wasted query in get_user()