Move find user to before filter