Merge "fix logic introduced in addNewAccountInternal"