Adjust the structure of the FAS credential per @ralphbean's advice