* changed account event + handler, code cleanup