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