Fix built-in user providers
Merge pull request #324 from stloyd/bugfix/user_providers

[RFC] Fix built-in user providers