Fixing a problem when configuring users since service tenant creation is missing