ECMS-5822: Update the authenticate service