Merge "Fix crash when removing an account." into jb-dev