#480 fixed account observer for code-review