enhance the handling of Multiple account