Improved account system event handler [tracker #1670]