am be504401: Merge "Fix bug where existing account not pre-checked" into jb-dev

* commit 'be5044015212b82a6e530c4516004255fe245ebe':
  Fix bug where existing account not pre-checked