Rationalise ordering of authentication operations. Still some work to do,