CF-7 Merged UserProvider with UserRepository, finalized UserProvider implementation