ESO: Modified yet again the form activation logic

Sorry about this. We really need to get this automated login testing capability up and running.