Fixing multi account issue