Code fix to support linking of accounts