Fix bug with account additions using old Entity API