Hello,
i think the same as well, it would be very op to have something like that. And, to be honest in my opinion it isnt worth it to mess up with skills while in poly or not, x condition or y condition and playing with exceptions. Better to leave it as it is, as Toxic stated above AoS is not the only skill that gets deactivated on re-log, warrior would get advantage with it anyhow so it would be also unfair change.
Regards.