Restore user find

Resolves #839