Shattered Kingdoms

There is an issue where when a person voids out (a sad common occurrence for poor me), the elemental is not in group/nowhere to be found when I log back in. Problem is my timer still won't let me conjure an elemental.

I know this is a function of when a person logs out in a different room from their pet, their pet is lost. Is it possible to a) fix it so a pet not in the same room saves with the caster, or b) change the void logout stuff to send the user back to the room they were in immediately prior to logout to preserve pets?

<3

It would be nice if pets voided out with PCs, with the exception of charmed PCs.