Added fix for add and remove account