SAHI - it should now work with both old and new login pages