Fix issue with mutliple accounts