resolve bugs introduced to CAS module during ChoiceAuth implementation