Move find user to before filter
Merge pull request #1 from maxsuhak/patch-1

Move find user to before filter