Reverted to old AccountProvider - ServiceBuilder doesn't yet work