Refs #5473 - unify client authentication code