unify AAF and non-AAF credentials for healthcheck