8894 - Text modification and hook addition to setup step 2.6.

Hold off on pulling this in until I clear with James - this may need a further small change or two.