Fix adding multiple watched/known accounts during onboarding