Fixed bug with accountname capture