CAAERS-6988 - fixing intermittent invalid credentials issue