Merge "Fix crash when adding account"