Refactor account creation to allow external index
Merge remote-tracking branch 'upstream/master'