Back ported bug fix by @dhabib for household naming issue on one to one
accounts