Make 40621 not break CentralAuth