User provider fix #12

Code and script fix for #12