adding userprovider and enabling some commented out features